Commits · 56852a714ce9ebaaa85b133924dd6b6534c4eb29 · afi / opacce

Nov 20, 2017
- collect strings · 56852a71
  Patrick Barroca authored 7 years ago
  
  56852a71
Nov 15, 2017
- Merge branch 'dev#65273_s91_contractuel_cavy_export_des_articles_agenda_en_json' into 'master' · ce18c4bc
  Patrick Barroca authored 7 years ago
```
Dev#65273 s91 contractuel cavy export des articles agenda en json

See merge request !2399
```
  ce18c4bc
Nov 14, 2017
- dev #65273 : fix RT · c4acffc0
  Patrick Barroca authored 7 years ago
  
  c4acffc0
- dev #65273 : enhance feature file · 87040da5
  Patrick Barroca authored 7 years ago
  
  87040da5
- Merge branch 'hotline-master' into 'master' · 461b2310
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request !2396
```
  461b2310
- 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-master' into 'master' · 9d633325
  Ghislain Loas authored 7 years ago
```
Hotline master

See merge request !2394
```
  9d633325
- 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
- dev #65273 : remove raw link to export ical · 88ed209b
  Patrick Barroca authored 7 years ago
  
  88ed209b
- Merge branch 'hotline-master' into 'master' · f14628bb
  Patrick Barroca authored 7 years ago
```
Hotline master

See merge request !2391
```
  f14628bb
- dev #65273 : feature file · e0dd6c84
  Patrick Barroca authored 7 years ago
  
  e0dd6c84
- 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
- dev #65273 : fix failures · 8ac2bfe9
  Patrick Barroca authored 7 years ago
  
  8ac2bfe9
- dev #65273 : fix broken BYDAY definition · 7b19f58c
  Patrick Barroca authored 7 years ago
  
  7b19f58c
- dev #65273 : ensure utf-8 encoding of numeric entities · eed9d294
  Patrick Barroca authored 7 years ago
  
  eed9d294
- dev #65273 : ensure utf-8 encoding of decoded entities · 82cf495a
  Patrick Barroca authored 7 years ago
  
  82cf495a
- dev #65273 : description cannot contain HTML, use X-ALT-DESC instead · e25b373d
  Patrick Barroca authored 7 years ago
  
  e25b373d
- dev #65273 : description cannot contain HTML, use X-ALT-DESC instead · 6dbff0e8
  Patrick Barroca authored 7 years ago
  
  6dbff0e8
- 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
- Merge branch... · fe5a6053
  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 #65273 : recurrence refinements and article tags · 29b20819
  Patrick Barroca authored 7 years ago
  
  29b20819
- dev #66943 update previous hold end time when overwrite · ded2b49e
  Ghislain Loas authored 7 years ago
  
  ded2b49e
- dev #65273 : refactoring · e5ad93a6
  Patrick Barroca authored 7 years ago
  
  e5ad93a6
- 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 #65273: export agenda ICAL : add dtend for recurrence dates · 83b7915e
  efalcy authored 7 years ago
  
  83b7915e
- dev #65273: export agenda ICAL : add custum fields and fix recurrence datas · 3e18145d
  efalcy authored 7 years ago
  
  3e18145d
- dev #65552 add and use jquery.timeline for AFIMultimédia holds · d57a98cf
  Ghislain Loas authored 7 years ago
  
  d57a98cf
- dev #65273: export agenda ICAL : add image · b1a236c3
  efalcy authored 7 years ago
  
  b1a236c3
- dev #65273: export agenda ICAL : article url · 73dd73b3
  efalcy authored 7 years ago
  
  73dd73b3

Admin message