Commits · 13e68566d97f206713e22750846f3162103a6e04 · afi / opacce

Feb 13, 2017
- Merge branch 'origin-stable' · 13e68566
  Ghislain Loas authored 8 years ago
```
Conflicts:
	cosmogramme/php/_init.php
```
  13e68566
- Merge branch... · 46b4c14b
  Ghislain Loas authored 8 years ago
```
Merge branch 'dev#56105_eponge_tableau_de_bord_des_ressources_electroniques_depuis_nanook' into 'stable'

eponge #56105 systeme/status is now public /opac/index/status

See merge request !2037
```
  46b4c14b
- eponge #56105 systeme/status is now public /opac/index/status · 2dd3e11f
  Ghislain Loas authored 8 years ago
  
  2dd3e11f
Feb 10, 2017

Merge branch 'hotline#54522_dev_traitement_par_lot_collections_numeriques' into 'stable' · 394b9e7f
Ghislain Loas authored 8 years ago
```
holtine #54522 imprive multiple selection form with hover effect

See merge request !2036
```
394b9e7f
holtine #54522 imprive multiple selection form with hover effect · c4c471a9
Ghislain Loas authored 8 years ago

c4c471a9
Merge branch 'dev#55147_ponge_s73' into 'master' · 3fa28b95
Ghislain Loas authored 8 years ago
```
Dev#55147 ponge s73

See merge request !2035
```
3fa28b95

Merge branch... · 31ec6489

Ghislain Loas authored 8 years ago

Merge branch 'hotline#55934_acces_aux_profils_impossible_pour_les_administrateurs_bibliotheque' into 'stable'

hotline #55934 fix fatal error in /admin/profil/index when logged as library admin

See merge request !2031

31ec6489

Merge branch 'origin-dev#55145_contractuel_2455_le_kiosk_recherche_federee' · a2a5a919
Ghislain Loas authored 8 years ago
```
# Conflicts:
#	cosmogramme/sql/patch/patch_320.php
#	tests/db/UpgradeDBTest.php
```
a2a5a919

Merge branch... · 673cd627

Ghislain Loas authored 8 years ago

Merge branch 'dev#49634_bonus_2255_choix_du_site_de_retrait_precocher_site_abonne_et_non_site_document' into 'master'

Dev#49634 bonus 2255 choix du site de retrait precocher site abonne et non site document

See merge request !2033

673cd627

Merge branch... · 5a8fc642

Ghislain Loas authored 8 years ago

Merge branch 'dev#49440_1455_cosmogramme_integration_etalon_des_codifications_a_chaque_incrementiel' into 'master'

Dev#49440 1455 cosmogramme integration etalon des codifications a chaque incrementiel

See merge request !2032

5a8fc642

hotline #55934 fix fatal error in /admin/profil/index when logged as library admin · 8b397f9f
Ghislain Loas authored 8 years ago

8b397f9f
Merge branch 'dev#55147_ponge_s73' into 'stable' · 809f53e2
Ghislain Loas authored 8 years ago
```
Dev#55147 ponge s73

See merge request !2030
```
809f53e2

Feb 09, 2017
- dev #55147 to the top · 01534094
  Ghislain Loas authored 8 years ago
  
  01534094
- dev #49440 remove obsolete test · d4aae076
  Patrick Barroca authored 8 years ago
  
  d4aae076
- dev #55147 add link to Bokeh Days subscription · 4c6b6ed8
  Ghislain Loas authored 8 years ago
  
  4c6b6ed8
- Update 49634 · 5d506782
  Ghislain Loas authored 8 years ago
  
  5d506782
- dev #49634 fix fatal error · 6b553a14
  Ghislain Loas authored 8 years ago
  
  6b553a14
- dev #49440 remove standard synchronisation option from generate screen · a8e2b58c
  Patrick Barroca authored 8 years ago
  
  a8e2b58c
- dev #49634 use user branch code when pickup location choice is enabled · 87aeedfe
  Ghislain Loas authored 8 years ago
  
  87aeedfe
Feb 08, 2017
- dev #49440 remove link to deleted codif in items + fix date bug · 0374de5c
  Patrick Barroca authored 8 years ago
  
  0374de5c
- dev #49440 ensure phafi-mode select-db variable settings · a08b6f49
  Patrick Barroca authored 8 years ago
  
  a08b6f49
- dev #49440 resolve bokeh/cosmogramme name collision · 708eba3b
  Patrick Barroca authored 8 years ago
  
  708eba3b
- dev #55145 fix RT comments · e2b0d6c5
  Ghislain Loas authored 8 years ago
  
  e2b0d6c5
- dev #55145 RT : add test placeholder for patch_320.php · b054e57a
  Ghislain Loas authored 8 years ago
  
  b054e57a
- dev #55145 fix rt comments on migration · 5f7ee8e7
  Ghislain Loas authored 8 years ago
  
  5f7ee8e7
- dev #49440 remove legacy PATCH_LEVEL const · bb3de032
  Patrick Barroca authored 8 years ago
  
  bb3de032
- dev #55145 lekiosk : fix test failure · 574d9887
  Ghislain Loas authored 8 years ago
  
  574d9887
Feb 07, 2017
- dev #49440 handle branches as other codifications · 8ec5ddc7
  Patrick Barroca authored 8 years ago
```
and mark linked records to removed codifications as modified
```
  8ec5ddc7
- Forgotten patch_level bump · dba161ce
  Patrick Barroca authored 8 years ago
  
  dba161ce
- dev #55145 lekiosk : update version file · 2210d6b9
  Ghislain Loas authored 8 years ago
  
  2210d6b9
- dev #55145 reanimate no-ci tests · f1c23ebf
  Ghislain Loas authored 8 years ago
  
  f1c23ebf
- dev #55145 lekiosk : execute storm tests at last · 536824fd
  Ghislain Loas authored 8 years ago
  
  536824fd
- dev #55145 lekiosk : add sso and cas link to render album · 928d65f4
  Ghislain Loas authored 8 years ago
  
  928d65f4
- dev #49440 add standard update in prepare integration phase · 17472c2c
  Patrick Barroca authored 8 years ago
  
  17472c2c
- dev #55145 lekiosk : add batch + test fix · 66d3accb
  Ghislain Loas authored 8 years ago
  
  66d3accb
- dev #55145 migrate old lekiosk adminvars + add lekiosk adminvars · a7b43625
  Ghislain Loas authored 8 years ago
  
  a7b43625
- dev #55145 remove lekiosk from static js list · 9faedbc4
  Ghislain Loas authored 8 years ago
  
  9faedbc4
- dev #55145 remove unused lekiosk adminvars fixtures · 5349932a
  Ghislain Loas authored 8 years ago
  
  5349932a
- dev #55145 fix fatal error · 038311a1
  Ghislain Loas authored 8 years ago
  
  038311a1
Feb 06, 2017
- dev #55145 add xml parsing · ffbbf648
  Ghislain Loas authored 8 years ago
  
  ffbbf648

Admin message