Commits · 8d25da92cea907345ae50bc2289b22acefeec6b0 · afi / opacce

Jan 03, 2017

Merge branch 'master' into... · 8d25da92

efalcy authored 8 years ago

Merge branch 'master' into origin-dev#50182_1055_seaside_meilleur_reporting_poker_1_generation_du_rapport_html_dans_bokeh_json

8d25da92

Dec 23, 2016
- Merge remote-tracking branch 'refs/remotes/origin/hotline-master' · 88c08ed4
  Ghislain Loas authored 8 years ago
  
  88c08ed4
Dec 22, 2016
- version 7.7.22 · 232e925e
  Ghislain Loas authored 8 years ago
  
  7.7.22
  
  232e925e
- Merge branch... · 274c94e3
  Ghislain Loas authored 8 years ago
```
Merge branch 'hotline#52395_resultat_recherche_mode_mur_icones_de_la_barre_de_lien_ko_incompatibilite_avec_les_portails_chartes' into 'hotline-master'

hotline #52395 fix link html in search result wall mode record toolbar

See merge request !1967
```
  274c94e3
- hotline #52395 fix test failure · 494572c2
  Ghislain Loas authored 8 years ago
  
  494572c2
- Merge branch 'hotline#52410_capv38_bug_modif_boites_dans_le_backoffice' into 'hotline-master' · 1286fc43
  Ghislain Loas authored 8 years ago
```
Hotline#52410 capv38 bug modif boites dans le backoffice

See merge request !1966
```
  1286fc43
- hotline #52395 fix link html in search result wall mode record toolbar · f68f664a
  Ghislain Loas authored 8 years ago
  
  f68f664a
Dec 21, 2016
- hotline #52410 test fix · 13508ef0
  Laurent authored 8 years ago
  
  13508ef0
- Reverting "hotline #52410 form elements without label should be wrap with td colspan 2" · 49eb7dac
  Laurent authored 8 years ago
```
Revert "hotline #52410 form elements without label should be wrap with td colspan 2"

This reverts commit 2b111998.
```
  49eb7dac
- hotline #52410 fix items alignment in treeselect · 5979cdb3
  Laurent authored 8 years ago
  
  5979cdb3
- hotline #52410 form elements without label should be wrap with td colspan 2 · 2b111998
  Laurent authored 8 years ago
  
  2b111998
- hotline #52410 fix home widget save params from backoffice · 8edcfb3e
  Laurent authored 8 years ago
  
  8edcfb3e
- Merge branch 'performance_improvements' into 'master' · 8b66d0e6
  Ghislain Loas authored 8 years ago
```
Performance improvements

See merge request !1965
```
  8b66d0e6
- phafi-toggle-profiling works again · c3b84290
  Laurent authored 8 years ago
  
  c3b84290
Dec 20, 2016
- Merge branch 'master' into performance_improvements · 4c7eb749
  Laurent authored 8 years ago
  
  4c7eb749
- perf improvements test fix · 4515d0b3
  Laurent authored 8 years ago
  
  4515d0b3
- delete resurected file · 23c44c83
  Ghislain Loas authored 8 years ago
  
  23c44c83
- Merge branch 'master' into performance_improvements · 077ead2f
  Laurent authored 8 years ago
  
  077ead2f
- update storm ref · a7b88ecc
  Ghislain Loas authored 8 years ago
  
  a7b88ecc
- perf improvements on translate · c111d919
  Laurent authored 8 years ago
  
  c111d919
- fix merge conflict · a3c23808
  Ghislain Loas authored 8 years ago
  
  a3c23808
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · 07db66be
  Ghislain Loas authored 8 years ago
```
# Conflicts:
#	tests/application/modules/admin/controllers/NewsletterControllerTest.php
#	tests/library/Class/NewsletterSubscriptionTest.php
```
  07db66be
- add mockedClasses · 63e9ec45
  Ghislain Loas authored 8 years ago
  
  63e9ec45
- Merge branch 'master' into performance_improvements · 4bea4e87
  Laurent authored 8 years ago
  
  4bea4e87
- improve Class_Indexation construct performance · d3988d6e
  Laurent authored 8 years ago
  
  d3988d6e
- update storm ref · 1f7b95a4
  Ghislain Loas authored 8 years ago
  
  1f7b95a4
- update call to getMock to createMock · ff0c5be6
  Ghislain Loas authored 8 years ago
  
  ff0c5be6
- fix html5 & qunit failures · 8a3bda8d
  Ghislain Loas authored 8 years ago
  
  8a3bda8d
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · 1a01ee69
  Ghislain Loas authored 8 years ago
  
  1a01ee69
- fix default-ci-dump url · fca5bcda
  Ghislain Loas authored 8 years ago
  
  fca5bcda
- Merge branch 'master' into origin-hotline-master · 167fe8eb
  Ghislain Loas authored 8 years ago
  
  167fe8eb
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · dd9b069f
  Ghislain Loas authored 8 years ago
  
  dd9b069f
- tests: assertHTML5: w3c validator url can be configured with... · a7b3041a
  Laurent authored 8 years ago
```
tests: assertHTML5: w3c validator url can be configured with BOKEH_HTML_VALIDATOR_URL environment variable
```
  a7b3041a
Dec 19, 2016
- version 7.7.21 · 7f26cfe3
  Ghislain Loas authored 8 years ago
  
  7.7.21
  
  7f26cfe3
- dev #50182 report: fix test · 5350eaac
  Laurent authored 8 years ago
  
  5350eaac
- Fix database url for CI · d731cee5
  Laurent authored 8 years ago
  
  d731cee5
Dec 16, 2016
- dev #50182 reporting : RT comments · 3819e818
  Laurent authored 8 years ago
  
  3819e818
- dev #50182 reporting : digital connectors displayed when activated or album count > 0 · cc4bd84f
  Laurent authored 8 years ago
  
  cc4bd84f
- dev #50182 reporting : better variables filtering · 8652eeec
  Laurent authored 8 years ago
  
  8652eeec
- dev #50182 reporting : test fix · 559634bc
  Laurent authored 8 years ago
  
  559634bc

Admin message