Commits · cb056995b7e4336369a2a5cbe48624f5b2d11d52 · afi / opacce

Nov 14, 2017
- version 7.11.9 · cb056995
  Ghislain Loas authored 7 years ago
  
  7.11.9
  
  cb056995
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · 1b0c1134
  Ghislain Loas authored 7 years ago
```
Conflicts:
	cosmogramme/sql/patch/patch_337.php
	tests/db/UpgradeDBTest.php
```
  1b0c1134
Nov 13, 2017
- Merge branch 'hotline#67232_dole_moissonnage_pnb_ne_fonctionne_plus' into 'hotline-master' · 8109a04f
  Ghislain Loas authored 7 years ago
```
Hotline#67232 dole moissonnage pnb ne fonctionne plus

See merge request !2393
```
  8109a04f
- hotline #67232 fix syntax error · 7c9f6da8
  Ghislain Loas authored 7 years ago
  
  7c9f6da8
- hotline #67232 fix migration patch · 7b311e7e
  Ghislain Loas authored 7 years ago
  
  7b311e7e
- hotline #67232 fix calls to Class_Album::setEditeur · ee69714f
  Ghislain Loas authored 7 years ago
  
  ee69714f
- hotline #67232 update version file · 2ac49fc0
  Ghislain Loas authored 7 years ago
  
  2ac49fc0
- hotline #67232 fix calls to Album::setEditeur · 2adf2adf
  Ghislain Loas authored 7 years ago
  
  2adf2adf
- hotline #67232 digital resource does not call Album::setEditeur anymore · 4b21be3d
  Ghislain Loas authored 7 years ago
  
  4b21be3d
- hotline #67232 deprecate Album::setEditeur · 08249f9b
  Ghislain Loas authored 7 years ago
  
  08249f9b
Nov 10, 2017

Merge branch 'dev#65552_rendre_les_reservation_afimultimedia_plus_visible' into 'stable' · 705ed9f0
Ghislain Loas authored 7 years ago
```
Dev#65552 rendre les reservation afimultimedia plus visible

See merge request !2388
```
705ed9f0

Ghislain Loas authored 7 years ago

Merge branch 'dev#49315_ajouter_un_commentaire_sur_les_postes_etou_groupe_de_poste_visible_lors_de_la_reservation_cote_bokeh' into 'stable'

dev #49315 add note to devices

See merge request !2389

fe5a6053

Merge branch... · 4591eca4

Ghislain Loas authored 7 years ago

Merge branch 'dev#66943_bokeh_ne_met_pas_a_jour_la_reservation_qui_n_a_pas_ete_consommee' into 'stable'

dev #66943 update previous hold end time when overwrite

See merge request !2390

4591eca4

Nov 09, 2017
- dev #66943 update previous hold end time when overwrite · ded2b49e
  Ghislain Loas authored 7 years ago
  
  ded2b49e
- dev #49315 add note to devices · d7a5857e
  Ghislain Loas authored 7 years ago
  
  d7a5857e
- dev #65552 improve view · 620f4647
  Ghislain Loas authored 7 years ago
  
  620f4647
- dev #65552 add empty message + clean code · 56e71c69
  Ghislain Loas authored 7 years ago
  
  56e71c69
Nov 08, 2017
- dev #65552 add delete hold link · bb558fda
  Ghislain Loas authored 7 years ago
  
  bb558fda
- dev #65552 add and use jquery.timeline for AFIMultimédia holds · d57a98cf
  Ghislain Loas authored 7 years ago
  
  d57a98cf
Nov 07, 2017
- version 7.11.8 · b131759f
  Patrick Barroca authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/profil/proprietes.phtml
#	library/startup.php
```
  7.11.8
  
  b131759f
- version 7.10.10 · 569c5ef3
  Patrick Barroca authored 7 years ago
  
  7.10.10
  
  569c5ef3
- Merge branch 'hotline#66742_la_madeleine_pbm_sur_kiosque_et_affichage_de_resultats' into 'stable' · c2edfdd0
  Patrick Barroca authored 7 years ago
```
Hotline#66742 la madeleine pbm sur kiosque et affichage de resultats

See merge request !2387
```
  c2edfdd0
- hotline #66742 : fix failures · 18097b14
  Patrick Barroca authored 7 years ago
  
  18097b14
- hotline #66742 : fix failures · f292e336
  Patrick Barroca authored 7 years ago
  
  f292e336
- hotline #66742 : fix dragAndDrop form element to use input value · 65c095e7
  Patrick Barroca authored 7 years ago
  
  65c095e7
- hotline #66742 : cannot set empty default page size · eb854c72
  Patrick Barroca authored 7 years ago
  
  eb854c72
- hotline #66742 : cannot set empty search result page size · a41aa067
  Patrick Barroca authored 7 years ago
  
  a41aa067
- hotline #66742 : can view search result config from admin · de3e8529
  Patrick Barroca authored 7 years ago
  
  de3e8529
Oct 25, 2017
- version 7.11.7 · 8800de23
  Ghislain Loas authored 7 years ago
  
  7.11.7
  
  8800de23
- version 7.10.9 · 4c3323d4
  Ghislain Loas authored 7 years ago
  
  7.10.9
  
  4c3323d4
- Merge remote-tracking branch 'refs/remotes/origin/stable' · e5f74908
  Ghislain Loas authored 7 years ago
```
Conflicts:
	VERSIONS
	VERSIONS_HOTLINE/65680
	library/startup.php
```
  e5f74908
- Merge branch 'hotline#65680_arte_univers_cine_suite_du_ticket_65505' into 'stable' · 9bc3571c
  Ghislain Loas authored 7 years ago
```
hotline #65680 fix artevod

See merge request !2383
```
  9bc3571c
- hotline #65680 fix artevod · ea1e2253
  Ghislain Loas authored 7 years ago
  
  ea1e2253
Oct 24, 2017
- version 7.11.6 · 336a2327
  Ghislain Loas authored 7 years ago
  
  7.11.6
  
  336a2327
- version 7.10.8 · 40535d5b
  Ghislain Loas authored 7 years ago
  
  7.10.8
  
  40535d5b
- Merge branch 'hotline-master' into 'master' · 9d34ea3c
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request !2382
```
  9d34ea3c
- Merge branch 'stable' into 'hotline-master' · e73bff63
  Ghislain Loas authored 7 years ago
```
Stable

See merge request !2381
```
  e73bff63
- Merge branch 'hotline#65246_comptes_utilisateurs_introuvables' into 'stable' · 23ea152c
  Ghislain Loas authored 7 years ago
```
hotline #65246 fix double finder

See merge request !2378
```
  23ea152c
- hotline #65246 refacto singleNanook + fix failures · 877bdc0c
  Ghislain Loas authored 7 years ago
  
  877bdc0c
- Merge branch 'hotline#66007_master_systeme_de_notation_des_avis_ko' into 'hotline-master' · 0ed61071
  Ghislain Loas authored 7 years ago
```
hotline #66007 :replace js rating by compatible js with jquery 3.2

See merge request !2375
```
  0ed61071

Admin message