Commits · 955c925727f93d7a7a5031a34e3e39747f007525 · afi / opacce

Oct 23, 2014
- rel #15527 : fix typo in dispatch params in tests · 955c9257
  Patrick Barroca authored 10 years ago
  
  955c9257
Oct 21, 2014
- dev #15527 remove xdebug_break · 819137d0
  efalcy authored 10 years ago
  
  819137d0
- dev #15527 fix tests · ff7337cc
  efalcy authored 10 years ago
  
  ff7337cc
- dev #15527 fix tests · af8be41d
  efalcy authored 10 years ago
  
  af8be41d
Oct 16, 2014
- dev #15527 fix some tests failures · a61131ea
  efalcy authored 10 years ago
  
  a61131ea
- dev #15527 fix and add more tests · 3b74e9f5
  efalcy authored 10 years ago
  
  3b74e9f5
- dev #15527 fix test (use FileSystem) · 24080113
  efalcy authored 10 years ago
  
  24080113
- dev #15527 try to fix test failure · c75eff9f
  efalcy authored 10 years ago
  
  c75eff9f
Oct 15, 2014
- dev #15527 : merge request comments , refactoring · 112b1efa
  efalcy authored 10 years ago
  
  112b1efa
Oct 14, 2014
- dev #449 : merge request comments (until localisations.phtml comments) · 95f97b14
  efalcy authored 10 years ago
  
  95f97b14
- fix merge conflict, another branch has same sql patch number · a46f47b4
  Patrick Barroca authored 10 years ago
  
  a46f47b4
- dev #15527 version_wip · c003ef7f
  Ghislain Loas authored 10 years ago
  
  c003ef7f
- dev #15527 fix test failures + version_wip · ecf33d8a
  Ghislain Loas authored 10 years ago
  
  ecf33d8a
- dev #15527 : return better location by quality (number of params) · 5e1384bd
  Ghislain Loas authored 10 years ago
  
  5e1384bd
- dev #15527 refacto location for item cote test · cbb63740
  Ghislain Loas authored 10 years ago
  
  cbb63740
Oct 13, 2014
- dev #15527 refacto location for item · 8457f157
  Ghislain Loas authored 10 years ago
  
  8457f157
Oct 10, 2014
- dev #15527 add genre filter to front display · 3b7216b8
  Ghislain Loas authored 10 years ago
  
  3b7216b8
Oct 07, 2014
- dev #15527 add cosmo patch : add genre in localisation table · c57ffbe7
  efalcy authored 10 years ago
  
  c57ffbe7
- dev #15527 fix tests · b6e70ee4
  efalcy authored 10 years ago
  
  b6e70ee4
- dev #15527 add missing file · 58967c24
  efalcy authored 10 years ago
  
  58967c24
Oct 01, 2014

dev #15527 : stormized Plan and Localisation, add genre on edit localisation... · 492c11b8

efalcy authored 10 years ago

dev  #15527 : stormized Plan and Localisation, add genre on edit localisation + fix bug (plan photo not displayed on edit page)

492c11b8

Sep 30, 2014
- Merge branch 'hotline_6.53' into 'master' · d5026ffe
  Laurent authored 10 years ago
```
Hotline 6.53

See merge request !422
```
  d5026ffe
- Fix PHP5.4 compatibility · 614f0f23
  Laurent authored 10 years ago
  
  614f0f23
Sep 29, 2014
- 6.53.0 · 0e77f43d
  Patrick Barroca authored 10 years ago
  
  6.53.0
  
  0e77f43d
- Merge branch 'hotline_6.52' into 'master' · bb9620f1
  Patrick Barroca authored 10 years ago
```
Hotline 6.52

See merge request !421
```
  bb9620f1
- Merge branch 'dev_#14885_renew_result_in_modal_popup' into 'master' · c04a3531
  Patrick Barroca authored 10 years ago
```
Dev #14885 renew result in modal popup

See merge request !420
```
  c04a3531
- Merge remote-tracking branch 'refs/remotes/afi/dev_#15884_ccbs_la_boucle_skin' into afi-master · 0ff2f5a7
  Patrick Barroca authored 10 years ago
```
Conflicts:
	library/ZendAfi/View/Helper/Accueil/Calendar.php
	tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php
```
  0ff2f5a7
- update version · 9057795f
  Ghislain Loas authored 10 years ago
  
  9057795f
- Merge remote-tracking branch... · 30c790d4
  Patrick Barroca authored 10 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/dev#12996_formation_ajout_zone_groupe_utilisateur' into afi-master

Conflicts:
	tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
	tests/application/modules/admin/controllers/UserGroupControllerTest.php
```
  30c790d4
- Merge remote-tracking branch... · 35b2045f
  Patrick Barroca authored 10 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/hotline_16358_fix_update_notice_cosmogramme' into afi-hotline_6.52

Conflicts:
	VERSIONS
```
  35b2045f
- rel #16358 : RT small code formatting · f9af2f1e
  Patrick Barroca authored 10 years ago
  
  f9af2f1e
- add missing unimarc okapi · 82a74e13
  Ghislain Loas authored 10 years ago
  
  82a74e13
- dev #14409 filters in calendar box · 5771b640
  Laurent authored 10 years ago
```
admin: swap available and selected filters list
```
  5771b640
- Merge branch 'hotline#16434_change_ckeditor_id' into 'hotline_6.52' · 14ffd504
  Patrick Barroca authored 10 years ago
```
Hotline#16434 change ckeditor

See merge request !411
```
  14ffd504
Sep 26, 2014
- rel #12996 : fix tests failures · d58d0583
  Patrick Barroca authored 10 years ago
  
  d58d0583
- Merge branch 'hotline_6.52' into hotline_16358_fix_update_notice_cosmogramme · 39459ef0
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
```
  39459ef0
- rel #12996 : fix CI failures · ebc667ec
  Patrick Barroca authored 10 years ago
  
  ebc667ec
- rel #12996 : fix CI failures · 49dd5408
  Patrick Barroca authored 10 years ago
  
  49dd5408
- fix delete: now using storm deleteBy · c7d7409d
  Ghislain Loas authored 10 years ago
  
  c7d7409d
- rel #12996 : fix CI failures · 7741cdcd
  Patrick Barroca authored 10 years ago
  
  7741cdcd

Admin message