Master (!2514) · 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

Feb 22, 2018
- Merge branch 'hotline-master' into 'master' · b3fc3f13
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request !2513
```
  b3fc3f13
- version 7.11.21 · da24ad05
  Ghislain Loas authored 7 years ago
  
  da24ad05
- Merge remote-tracking branch 'origin/stable' into origin-hotline-master · 64fd5852
  Ghislain Loas authored 7 years ago
```
Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_340.php
	library/startup.php
	tests/fixtures/NanookFixtures.php
```
  64fd5852
- version 7.10.23 · cca33d7c
  Ghislain Loas authored 7 years ago
  
  cca33d7c
Feb 19, 2018

Merge branch... · 86b67732

Ghislain Loas authored 7 years ago

Merge branch 'hotline#71540_probleme_de_connexion_d_un_usager_sur_la_webotheque52' into 'hotline-master'

hotline #71540 : CVS : fix xml validity when login contains ampersand

See merge request !2494

86b67732

Feb 14, 2018
- hotline #71540 : CVS : fix xml validity when login contains ampersand · 1a55767a
  efalcy authored 7 years ago
  
  1a55767a
- Merge branch 'hotline#70912_duplication_du_champ_editeur' into 'stable' · 535d2abe
  Ghislain Loas authored 7 years ago
```
hotline #70912 add all editors to record display

See merge request !2493
```
  535d2abe
- hotline #70912 fix tests failures · 679f146d
  Ghislain Loas authored 7 years ago
  
  679f146d
Feb 13, 2018
- hotline #70912 add all editors to record display · b2a5a7d6
  Ghislain Loas authored 7 years ago
  
  b2a5a7d6
- Merge branch... · 569bf0a3
  Ghislain Loas authored 7 years ago
```
Merge branch 'hotline#71124_administration_groupes_impossible_d_ajouter_une_categorie_ou_un_groupe' into 'stable'

hotline #71124 : sql migration for circular user group categories

See merge request !2492
```
  569bf0a3
- hotline #71124 : sql migration for circular user group categories · cb0b8c5f
  Ghislain Loas authored 7 years ago
  
  cb0b8c5f
- Merge branch... · 9e9bc1eb
  Ghislain Loas authored 7 years ago
```
Merge branch 'hotline#70872_dvd_barbara_de_saint_pargoire_apparait_dans_le_bandeau_de_gignac' into 'stable'

hotline #70872 update annex of exemplaires when webservice call

See merge request !2491
```
  9e9bc1eb
- hotline #70872 update annex of exemplaires when webservice call · 9a8ab78b
  Ghislain Loas authored 7 years ago
  
  9a8ab78b