Commits · 8dee40d344a6b632838ee57790f04e922c936ff9 · afi / opacce

Nov 07, 2017
- dev #65273: export agenda ICAL : add custom fields · 8dee40d3
  efalcy authored 7 years ago
  
  8dee40d3
- dev #65273: export agenda ICAL : add day recurrences · be32de7d
  efalcy authored 7 years ago
  
  be32de7d
- dev #65273: export agenda ICAL : add dates, location, summary, description · 83943db8
  efalcy authored 7 years ago
  
  83943db8
- Merge branch 'explo-export-ical' into... · e4749f7f
  efalcy authored 7 years ago
```
Merge branch 'explo-export-ical' into 'dev#65273_s91_contractuel_cavy_export_des_articles_agenda_en_json'

PoC

See merge request !2386
```
  e4749f7f
Oct 25, 2017
- version 7.11.7 · 8800de23
  Ghislain Loas authored 7 years ago
  
  7.11.7
  
  8800de23
- 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
- Merge branch 'hotline#65680_arte_univers_cine_suite_du_ticket_65505' into 'stable' · e97193df
  Ghislain Loas authored 7 years ago
```
hotline #65680 upgrade artevod link

See merge request !2376
```
  e97193df
- holtine #65246 fix tests failrues · 1c026cf9
  Ghislain Loas authored 7 years ago
  
  1c026cf9
Oct 23, 2017
- hotline #65246 respawn parent matchers · 65614f00
  Ghislain Loas authored 7 years ago
  
  65614f00
- Merge branch 'dev#61350_entrepot_oai_gallica_europeana' into 'master' · 5c45c90d
  Patrick Barroca authored 7 years ago
```
Dev#61350 entrepot oai gallica europeana

See merge request !2380
```
  5c45c90d
- Merge branch... · ff873d54
  Ghislain Loas authored 7 years ago
```
Merge branch 'dev#66057_bonus_utiliser_la_grande_image_plutot_que_la_vignette_en_affichage_notice' into 'master'

Dev#66057 bonus utiliser la grande image plutot que la vignette en affichage notice

See merge request !2379
```
  ff873d54
- hotline #65246 fix double finder · 68e307a1
  Ghislain Loas authored 7 years ago
  
  68e307a1
- hotline #66007 fix failures · 12e59a0d
  Ghislain Loas authored 7 years ago
  
  12e59a0d
- hotline #66007 fix rt comments. Rating actions / forms ... need a serious refacto ! · f246dd52
  Ghislain Loas authored 7 years ago
  
  f246dd52
Oct 19, 2017
- Merge branch 'hotline#66052_titre_des_ressources_numeriques' into 'stable' · 36c1f891
  Ghislain Loas authored 7 years ago
```
hotline #66052 : do not add empty subtitle on pseudo records indexation

See merge request !2374
```
  36c1f891
- Merge branch 'hotline#65557_bizarreries_abonne' into 'stable' · d76cff6e
  Ghislain Loas authored 7 years ago
```
hotline #65557: fix title in loan list

See merge request !2377
```
  d76cff6e
Oct 18, 2017
- hotline #65680 fix test failure · e5a771fb
  Ghislain Loas authored 7 years ago
  
  e5a771fb
- hotline #65557: fix title in loan list · 8c7cd4f0
  efalcy authored 7 years ago
  
  8c7cd4f0
- hotline #66007 : fix RT · 025abe0b
  efalcy authored 7 years ago
  
  025abe0b
- hotline #65680 upgrade artevod link · 8216c7de
  Ghislain Loas authored 7 years ago
  
  8216c7de
Oct 17, 2017
- hotline #66007 :replace js rating by compatible js with jquery 3.2 · f2d8cf10
  efalcy authored 7 years ago
  
  f2d8cf10
- hotline #66052 : do not add empty subtitle on pseudo records indexation · 9412233a
  Patrick Barroca authored 7 years ago
  
  9412233a
- dev #66057 fix tests failures · cbedeee4
  Ghislain Loas authored 7 years ago
  
  cbedeee4
- Merge remote-tracking branch 'refs/remotes/afi/master' into... · 41fd60a4
  Patrick Barroca authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/master' into dev#61350_entrepot_oai_gallica_europeana

# Conflicts:
#	application/modules/admin/views/scripts/album/edit-images.phtml
#	library/ZendAfi/View/Helper/TagUploadMultiple.php
#	tests/library/ZendAfi/View/Helper/TagUploadMultipleTest.php
```
  41fd60a4
- dev #61350 : version files · 58efbd8b
  Patrick Barroca authored 7 years ago
  
  58efbd8b
- dev #66057 fix tests failures · e0dfc722
  Ghislain Loas authored 7 years ago
  
  e0dfc722
- dev #66057 fix tests failures · 4b15718d
  Ghislain Loas authored 7 years ago
  
  4b15718d
- dev #66057 fix test failire + add const for no url from webservice = NO · 9cea6703
  Ghislain Loas authored 7 years ago
  
  9cea6703
Oct 16, 2017

Merge branch 'master' into... · a8b18319

Laurent authored 7 years ago

Merge branch 'master' into origin-dev#66057_bonus_utiliser_la_grande_image_plutot_que_la_vignette_en_affichage_notice

Conflicts:
	library/ZendAfi/View/Helper/Notice/Vignette.php

a8b18319

7.11.5 · 746a79fc
Laurent authored 7 years ago

7.11.5

746a79fc
Merge branch 'stable' into hotline-master · e5cafa71
Laurent authored 7 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
e5cafa71

Admin message