Master (!2480) · Merge requests · afi / opacce · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Merged Master

master into WIP

Merged Ghislain Loas requested to merge master into WIP 7 years ago

Jan 26, 2018
- Merge branch 'hotline-master' into 'master' · 86e16a8f
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request !2479
```
  86e16a8f
Jan 24, 2018
- version 7.11.18 · 61bb90ca
  efalcy authored 7 years ago
  
  61bb90ca
- remove comments · 83301497
  efalcy authored 7 years ago
  
  83301497
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · 5a58b129
  efalcy authored 7 years ago
```
Conflicts:
	VERSIONS
	library/Class/Indexation/PseudoNotice/UnimarcVisitor.php
	library/startup.php
```
  5a58b129
- version 7.10.20 · f716a6cd
  efalcy authored 7 years ago
  
  f716a6cd
- Merge branch 'hotline#69531_envoi_email_validation_inscription' into 'stable' · 82cc9079
  efalcy authored 7 years ago
```
Hotline#69531 envoi email validation inscription

See merge request !2469
```
  82cc9079
- Merge branch 'hotline#70308_deplacement_non_desire_d_une_boite' into 'stable' · f9df3eab
  Ghislain Loas authored 7 years ago
```
hotline #70308 fix save widget settings

See merge request !2474
```
  f9df3eab
- hotline #70308 fix save widget settings · ae67e34b
  efalcy authored 7 years ago
  
  ae67e34b
Jan 18, 2018

Merge branch... · e7fcece1

Ghislain Loas authored 7 years ago

Merge branch 'hotline#69916_probleme_d_affichage_de_certaines_pages_valides_dans_un_kiosque' into 'stable'

hotline #69916 : limit unimarc field size on pseudo record indexing

See merge request !2470

e7fcece1

hotline #69916 : limit unimarc field size on pseudo record indexing · e47d4e89
Patrick Barroca authored 7 years ago

e47d4e89

Jan 17, 2018
- hotline #69531 fix test failure · 73c0b030
  Ghislain Loas authored 7 years ago
  
  73c0b030
Jan 16, 2018
- hotline #69531 improve actions on registration · 8e5277a9
  Ghislain Loas authored 7 years ago
  
  8e5277a9
- hotline #69531 fix date rendering + add sorter · b06f181c
  Ghislain Loas authored 7 years ago
  
  b06f181c
- hotline #69531 improve actions on registration · bdf511c3
  Ghislain Loas authored 7 years ago
  
  bdf511c3