Master (!1289) · Merge requests · afi / opacce

Merged Master

master into dev#10430_pick_day_agenda

Merged Ghislain Loas requested to merge master into dev#10430_pick_day_agenda 9 years ago

Nov 23, 2015
- 7.3.29 · 5b2d9a0e
  Laurent authored 9 years ago
```
Merge branch 'stable'

Conflicts:
	VERSIONS
	library/startup.php
```
  5b2d9a0e
- 7.2.28 · 8fba26a1
  Laurent authored 9 years ago
  
  8fba26a1
- Merge branch 'dev#23223_sito_widget_pagination' into 'master' · ed107331
  Laurent authored 9 years ago
```
Dev#23223 sito widget pagination

See merge request !1288
```
  ed107331
- dev #23223 sito_widget_pagination · 0eb63544
  Laurent authored 9 years ago
```
fix number of sites taken in account in grouped display
```
  0eb63544
- Merge branch 'dev#5524_add_refound_block_to_viewnotice' into 'master' · 87e34eb3
  Laurent authored 9 years ago
```
Dev#5524 add refound block to viewnotice

See merge request !1287
```
  87e34eb3
- dev #5524 refound block · d06f9aff
  Laurent authored 9 years ago
```
test fix
```
  d06f9aff
Nov 20, 2015
- dev #5524 refound block · 99dc6498
  Laurent authored 9 years ago
```
add rebound link
```
  99dc6498
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · f3479d30
  lbrun authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#23223_sito_widget_pagination

Conflicts:
	cosmogramme/sql/patch/patch_279.php
	tests/db/UpgradeDBTest.php
```
  f3479d30
- dev#23223_sito_widget_pagination: fix rt · 3f5b099e
  lbrun authored 9 years ago
  
  3f5b099e
- dev#23223_sito_widget_pagination: fix rt · 4b506399
  lbrun authored 9 years ago
  
  4b506399
- Merge branch... · db7ed9cb
  Patrick Barroca authored 9 years ago
```
Merge branch 'dev#32494_sitotheque_utiliser_l_interface_album_pour_creer_une_sitotheque' into 'master'

Dev#32494 sitotheque utiliser l interface album pour creer une sitotheque

See merge request !1286
```
  db7ed9cb
Nov 19, 2015
- dev#23223_sito_widget_pagination: rename constant + traduction · 34b59b66
  lbrun authored 9 years ago
  
  34b59b66
- Merge branch 'hotline#32189_fix_reviews_moderation_pagination' into 'stable' · ef9f6230
  Patrick Barroca authored 9 years ago
```
Hotline#32189 fix reviews moderation pagination

See merge request !1280
```
  ef9f6230
- rel #32494 : classic sitotheque menu item kept even if sito in album is activated · 56d6ec6d
  Patrick Barroca authored 9 years ago
  
  56d6ec6d
- rel #32494 : do not display website ressources in tree render · b9af815a
  Patrick Barroca authored 9 years ago
  
  b9af815a
Nov 18, 2015
- hotline #32189 fix reviews pagination · 62d2bc69
  Ghislain Loas authored 9 years ago
  
  62d2bc69
- dev#23223_sito_widget_pagination: test for cache · b084d95e
  lbrun authored 9 years ago
  
  b084d95e
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 6d5d6a93
  lbrun authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#23223_sito_widget_pagination

Conflicts:
	application/modules/admin/controllers/AccueilController.php
```
  6d5d6a93
- fix test web services Fnac · 36f97e5d
  Laurent authored 9 years ago
  
  36f97e5d
- rel #32494 : handling of website resource without a title · a27097e0
  Patrick Barroca authored 9 years ago
  
  a27097e0
- dev#23223_sito_widget_pagination: disable cache on pagination · b0b26f49
  lbrun authored 9 years ago
  
  b0b26f49
- rel #32494 : handling of sitotheques with many urls · e01fa0e3
  Patrick Barroca authored 9 years ago
  
  e01fa0e3
- version 7.2.27 · 3bbc3502
  Ghislain Loas authored 9 years ago
  
  3bbc3502
Nov 17, 2015
- dev#23223_sito_widget_pagination : add reload picto for random paged config · ef83712a
  lbrun authored 9 years ago
  
  ef83712a
- fix test web services Fnac · 5daf38c2
  Laurent authored 9 years ago
  
  5daf38c2
- dev#23223_sito_widget_pagination : add ajax pagination tests · 3592845c
  lbrun authored 9 years ago
  
  3592845c
- dev#23223_sito_widget_pagination : add ajax pagination · 8042af35
  lbrun authored 9 years ago
  
  8042af35
- dev #23223 sito_widget_pagination · 6c6e4ff9
  Laurent authored 9 years ago
```
fix sito migration
```
  6c6e4ff9
Nov 16, 2015
- dev#23223_sito_widget_pagination : change sito config + tests · c589ea54
  lbrun authored 9 years ago
  
  c589ea54
- dev#23223_sito_widget_pagination : add migration and tests · 67ec8625
  lbrun authored 9 years ago
  
  67ec8625
Nov 13, 2015
- tests · a0d8f1ba
  lbrun authored 9 years ago
  
  a0d8f1ba
- dev#23223_sito_widget_pagination: refont sito config · 3931c940
  lbrun authored 9 years ago
  
  3931c940
Nov 12, 2015
- rel #32494: fix links dont work on iframes · e5c6708f
  Patrick Barroca authored 9 years ago
  
  e5c6708f
- rel #32494: now can delete media poster · cd8e8c60
  Patrick Barroca authored 9 years ago
  
  cd8e8c60
- dev #5524 block viewnotice change methods names · 93f9d78c
  efalcy authored 9 years ago
  
  93f9d78c
- rel #32494: fix test failures + refacto · 7737f610
  Patrick Barroca authored 9 years ago
  
  7737f610
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 42938096
  lbrun authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#23223_sito_widget_pagination
```
  42938096
Nov 10, 2015
- rel #32494: mock http requests in tests + refacto · f7710c3a
  Patrick Barroca authored 9 years ago
  
  f7710c3a
- Merge remote-tracking branch 'refs/remotes/afi/master' into... · 98578029
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#32494_sitotheque_utiliser_l_interface_album_pour_creer_une_sitotheque
```
  98578029
- rel #32494: var to activate sito in albums + tests · 2574d514
  Patrick Barroca authored 9 years ago
  
  2574d514
- dev #5524 fix and add tests for recunts action · 3b6cdef7
  efalcy authored 9 years ago
  
  3b6cdef7
Nov 06, 2015
- rel #32494 album website better thumbnails · 49c91540
  Laurent authored 9 years ago
  
  49c91540
- rel #32494 album website module · 31e135ff
  Laurent authored 9 years ago
  
  31e135ff
Nov 05, 2015
- rel #32494 fix site creation for enssib · b85692fa
  Laurent authored 9 years ago
  
  b85692fa
- rel #32494 album web site: automatic creation of website category · ece324c2
  Laurent authored 9 years ago
  
  ece324c2
- rel #32494 album website wizard · 9cc5025f
  Laurent authored 9 years ago
  
  9cc5025f
- rel #32494 album web site: generate record thumbnail from first resource · f83205fe
  Laurent authored 9 years ago
  
  f83205fe
- rel #32494 use album to register web sites · d870da2d
  Laurent authored 9 years ago
  
  d870da2d
Nov 04, 2015
- dev#23223_sito_widget_pagination : fix tests · 3203ff60
  lbrun authored 9 years ago
  
  3203ff60
- dev#23223_sito_widget_pagination : add pagination and remove pagination on random affichage · 11eef6df
  lbrun authored 9 years ago
  
  11eef6df
Nov 03, 2015
- dev #23223 start upgrading pagination.phtml · e1eb2400
  Ghislain Loas authored 9 years ago
  
  e1eb2400
- dev #23223 fix sito param + start adding pagination · b7dee95b
  Ghislain Loas authored 9 years ago
  
  b7dee95b
- dev #23223 fix js nb_aff · 7d873da3
  Ghislain Loas authored 9 years ago
  
  7d873da3
- dev #23223 refacto sito widget · e8223232
  Ghislain Loas authored 9 years ago
  
  e8223232
Nov 02, 2015
- dev #5524 remove unknow file · 6256dbf3
  Ghislain Loas authored 9 years ago
  
  6256dbf3
- dev #5524 change label to "Contient" · 45c9e67c
  Ghislain Loas authored 9 years ago
  
  45c9e67c
- dev #5524 add missing file + refacto · e79d2a13
  Ghislain Loas authored 9 years ago
  
  e79d2a13
- dev #5524 move analytics to onglet_analytics · 72ea8b2f
  Ghislain Loas authored 9 years ago
  
  72ea8b2f
- dev #5524 start implementing · d50d9163
  Ghislain Loas authored 9 years ago
  
  d50d9163
- dev #5524 start commit · 496c935e
  Ghislain Loas authored 9 years ago
  
  496c935e

Admin message

Master

Merge request reports

Activity