Commits · 1b5ca19c1edaa9fcc2212b6ce8ad7b4a9603a7b4 · afi / opacce

Dec 22, 2016
- dev #45275 fix session storage resetting selected_items · 1b5ca19c
  Ghislain Loas authored 8 years ago
  
  1b5ca19c
Dec 21, 2016
- dev #45275 upgrade css · 7ef3ef3d
  Ghislain Loas authored 8 years ago
  
  7ef3ef3d
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 2b866791
  Ghislain Loas authored 8 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections
```
  2b866791
- dev #45275 revert check attribute "titre" in album validation · 4cf03371
  Ghislain Loas authored 8 years ago
  
  4cf03371
- Merge branch 'performance_improvements' into 'master' · 8b66d0e6
  Ghislain Loas authored 8 years ago
```
Performance improvements

See merge request !1965
```
  8b66d0e6
- dev #45275 re-implement limit + fix select / unselect category · fcf92695
  Ghislain Loas authored 8 years ago
  
  fcf92695
- dev #45275 revert removing validator on album form · ce94b032
  Ghislain Loas authored 8 years ago
  
  ce94b032
- dev #45275 plug album multiselection edit actions · c1cbcd56
  Ghislain Loas authored 8 years ago
  
  c1cbcd56
- phafi-toggle-profiling works again · c3b84290
  Laurent authored 8 years ago
  
  c3b84290
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · fafa42bc
  Ghislain Loas authored 8 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections
```
  fafa42bc
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
- Fix database url for CI · d731cee5
  Laurent authored 8 years ago
  
  d731cee5
Dec 18, 2016
- dev #45275 plug isSelected to api · 5ff46373
  Ghislain Loas authored 8 years ago
  
  5ff46373
Dec 16, 2016
- dev #45275 continue refacto · a726dcdf
  Ghislain Loas authored 8 years ago
  
  a726dcdf
- dev #45275 refacto multiSelection · 43929f31
  Ghislain Loas authored 8 years ago
  
  43929f31
- dev #45275 move multiSelection tests to scenario · 69df9ba8
  Ghislain Loas authored 8 years ago
  
  69df9ba8
Dec 15, 2016
- dev #45275 add link to add album categories and album in session · bc94d42d
  Ghislain Loas authored 8 years ago
  
  bc94d42d
- Merge branch 'master' into... · 177c34f8
  Ghislain Loas authored 8 years ago
```
Merge branch 'master' into origin-dev#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections
```
  177c34f8
- Merge branch 'hotline-master' into 'master' · 3ed3056a
  Patrick Barroca authored 8 years ago
```
Hotline master

See merge request !1957
```
  3ed3056a
- version 7.7.20 · 3361bf1a
  Patrick Barroca authored 8 years ago
  
  7.7.20
  
  3361bf1a
Dec 14, 2016

Merge branch... · c341db35

Patrick Barroca authored 8 years ago

Merge branch 'hotline#51867_boite_login_par_defaut_pouvoir_editer_ses_parametres' into 'hotline-master'

Hotline#51867 boite login par defaut pouvoir editer ses parametres

See merge request !1955

c341db35

Admin message