Commits · 0dbaf344c4dfbe3269644eb4828ce596ea12f527 · afi / opacce

Oct 09, 2017
- Merge branch 'dev#65510_maj_jquery' into 'master' · 0dbaf344
  Ghislain Loas authored 7 years ago
```
Dev#65510 maj jquery

See merge request !2366
```
  0dbaf344
Oct 06, 2017
- Merge branch 'dev#65265_versionning_des_articles_en_front' into 'master' · 4df625b6
  Patrick Barroca authored 7 years ago
```
Dev#65265 versionning des articles en front

See merge request !2364
```
  4df625b6
Oct 05, 2017
- dev #65265: fix RT · 88a29646
  Patrick Barroca authored 7 years ago
  
  88a29646
- dev #65265: fix RT · f7b40ee9
  Patrick Barroca authored 7 years ago
  
  f7b40ee9
Oct 03, 2017
- dev #65265 : fix redirect when no version at all · bb403b6c
  Patrick Barroca authored 7 years ago
  
  bb403b6c
- dev #65265 : fix test · 2e423f5e
  Patrick Barroca authored 7 years ago
  
  2e423f5e
- dev #65265 : fix css and test · 3b4ce4a8
  Patrick Barroca authored 7 years ago
  
  3b4ce4a8
Oct 02, 2017
- dev #65265 : versionning plugin refactored · 2627c4a7
  Patrick Barroca authored 7 years ago
  
  2627c4a7
- dev #65265 : versionning plugin refactored · ea807315
  Patrick Barroca authored 7 years ago
  
  ea807315
- Merge branch 'hotline-master' · ea70ab98
  Laurent authored 7 years ago
  
  ea70ab98
- 7.11.3 · 8bbe01cb
  Laurent authored 7 years ago
```
Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
```
  7.11.3
  
  8bbe01cb
- 7.10.5 · 6ae77789
  Laurent authored 7 years ago
  
  7.10.5
  
  6ae77789
- Merge branch 'hotline#65353_pb_reservation_en_ligne_sur_le_portail' into 'stable' · 8ffc8fe5
  Patrick Barroca authored 7 years ago
```
hotline #65353 fix hold link

See merge request !2356
```
  8ffc8fe5
Sep 30, 2017
- dev #65510 minify butterfly · 820a1386
  Laurent authored 7 years ago
  
  820a1386
- dev #65510 jquery mobile compatibility · c9b2a138
  Laurent authored 7 years ago
  
  c9b2a138
- dev #65510 fix jquery + amber loading in admin · 08e73d48
  Laurent authored 7 years ago
  
  08e73d48
- dev #65510 test fix · 27f5d960
  Laurent authored 7 years ago
  
  27f5d960
- dev #65510 cvs search compatibility · ffc3508d
  Laurent authored 7 years ago
  
  ffc3508d
- dev #65510 book widget compatibility · 5cdf76dd
  Laurent authored 7 years ago
  
  5cdf76dd
- dev #65510 book widget compatibility · f5c462dc
  Laurent authored 7 years ago
  
  f5c462dc
Sep 29, 2017
- dev #65510 clean album edit images screen · 447f66e2
  Laurent authored 7 years ago
  
  447f66e2
- dev #65510 jquery compat · 4aff1cba
  Laurent authored 7 years ago
  
  4aff1cba
- hotline #65353 fix hold link · 77f6282f
  Ghislain Loas authored 7 years ago
  
  77f6282f
- dev #65510 butterfly jquery compatibility · 3cfbf3b4
  Laurent authored 7 years ago
  
  3cfbf3b4
- dev #65510 fix slideshow with jquery.cycle · 61a706d4
  Laurent authored 7 years ago
  
  61a706d4
- dev #65510 fix jquery compatibility · 48a19fef
  Laurent authored 7 years ago
  
  48a19fef
- dev #65510 test fix · 1815e871
  Laurent authored 7 years ago
  
  1815e871
- dev #65510 fix jcarousel compatibility · e5900ed9
  Laurent authored 7 years ago
  
  e5900ed9
- dev #65510 test fix · 9805e650
  Laurent authored 7 years ago
  
  9805e650
- dev #65510 fix jquery compatibility · ea9d32c1
  Laurent authored 7 years ago
  
  ea9d32c1
- dev #65510 fix jquery compatibility · d2bf86a7
  Laurent authored 7 years ago
  
  d2bf86a7
- dev #65510 update jquery ui 1.12.1 , fix jquery compatibility · 9d8ca462
  Laurent authored 7 years ago
  
  9d8ca462
- dev #65510 update jquery to 3.2.1 · 037f77e5
  Laurent authored 7 years ago
  
  037f77e5
Sep 27, 2017
- update ref to redmine API · adb5af10
  Ghislain Loas authored 7 years ago
  
  adb5af10
- version 7.10.4 · 2b0e842c
  Ghislain Loas authored 7 years ago
  
  7.10.4
  
  2b0e842c
- version 7.11.2 · 6e5741c3
  Ghislain Loas authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  7.11.2
  
  6e5741c3
- Merge branch... · d2cfd4a4
  Ghislain Loas authored 7 years ago
```
Merge branch 'hotline#65395_impossible_de_valider_les_boites_bases_de_demo_en_master' into 'hotline-master'

hotline #65395 remove old code injected by previous merge

See merge request !2354
```
  d2cfd4a4
- hotline #65395 remove false test · acde42d2
  Ghislain Loas authored 7 years ago
  
  acde42d2
- Merge branch... · e4e9a97c
  Ghislain Loas authored 7 years ago
```
Merge branch 'dev#65212_explo_ne_plus_dupliquer_les_vignettes_dans_les_caches_locaux_de_chaque_bokeh' into 'stable'

dev #65212 replace writed local image to png response

See merge request !2353
```
  e4e9a97c
- hotline #65395 remove old code injected by previous merge · 8945964f
  Ghislain Loas authored 7 years ago
  
  8945964f

Admin message