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

Merged Master

master into dev#64072_pike

Merged Patrick Barroca requested to merge master into dev#64072_pike 7 years ago

Sep 06, 2017

Merge branch... · 294b4c4a

Patrick Barroca authored 7 years ago

Merge branch 'dev#61993_explo_les_icones_d_admin_en_front_ne_doivent_pas_cacher_le_texte' into 'master'

Dev#61993 explo les icones d admin en front ne doivent pas cacher le texte

See merge request !2317

294b4c4a

Merge branch 'hotline-master' into 'master' · d40679d3
Patrick Barroca authored 7 years ago
```
Hotline master

See merge request !2316
```
d40679d3

Sep 01, 2017
- loading admin popup skin on save dialog · 154d06c3
  Laurent authored 7 years ago
  
  154d06c3
- dev #61993 kiosk admin front : use extended actions to change kiosk content · 6b8ad931
  Laurent authored 7 years ago
  
  6b8ad931
- Merge branch 'hotline-master' into... · 33b75436
  Laurent authored 7 years ago
```
Merge branch 'hotline-master' into dev#61993_explo_les_icones_d_admin_en_front_ne_doivent_pas_cacher_le_texte
```
  33b75436
- Merge branch 'hotline#64151_ordre_alphabetique_des_usagers_du_portail' into 'hotline-master' · 7dcc01a7
  Ghislain Loas authored 7 years ago
```
hotline #64151 replace javascript table ordering by sql ordering in admin/users/index

See merge request !2306
```
  7dcc01a7
- dev #61993 workaround for default filters action to match admin css · 17e9f12a
  Laurent authored 7 years ago
  
  17e9f12a
- dev #61993 admin front nav css refactoring · a23a226a
  Laurent authored 7 years ago
  
  a23a226a
- dev #61993 inject menu admin link in module extended actions · 79a5dadd
  Laurent authored 7 years ago
  
  79a5dadd
Aug 31, 2017
- Merge branch 'hotline#64183_bug_lien_parametrage_de_boite_login' into 'hotline-master' · e8801530
  efalcy authored 7 years ago
```
hotline #64183 fix fatal error in auth/login module configuration

See merge request !2305
```
  e8801530
- Merge branch 'hotline#64143_probleme_affichage' into 'hotline-master' · cc74eea5
  efalcy authored 7 years ago
```
holtine #64143 improve cache key generation for CSS and JS. Now include bokeh minor version.

See merge request !2308
```
  cc74eea5
- holtine #64143 fix test failure · ba60e220
  Ghislain Loas authored 7 years ago
  
  ba60e220
- holtine #64143 improve cache key generation for CSS and JS. Now include bokeh minor version. · 0951ca77
  Ghislain Loas authored 7 years ago
  
  0951ca77
- hotline #64151 fix rt comments · 9c04bc53
  Ghislain Loas authored 7 years ago
  
  9c04bc53
Aug 30, 2017
- Merge branch... · e665b4e9
  Patrick Barroca authored 7 years ago
```
Merge branch 'hotline#59093_impossible_d_ajouter_une_boite_article_dans_la_banniere' into 'hotline-master'

hotline #59093 fix delete banner widget from back office

See merge request !2304
```
  e665b4e9
- Update 59093 · cd486e06
  Patrick Barroca authored 7 years ago
  
  cd486e06
- hotline #64151 fix tests failures · a85434c1
  Ghislain Loas authored 7 years ago
  
  a85434c1
- hotline #64151 replace javascript table ordering by sql ordering in admin/users/index · be71c5f1
  Ghislain Loas authored 7 years ago
  
  be71c5f1
- hotline #64183 fix fatal error in auth/login module configuration · 1cd38aa7
  Ghislain Loas authored 7 years ago
  
  1cd38aa7
- hotline #59093 fix test failure · 0fb9fd08
  Ghislain Loas authored 7 years ago
  
  0fb9fd08
Aug 29, 2017
- hotline #59093 fix test failure · 104c683d
  Ghislain Loas authored 7 years ago
  
  104c683d
- hotline #59093 fix delete banner widget from back office · ece8b4c5
  Ghislain Loas authored 7 years ago
  
  ece8b4c5
Aug 28, 2017
- dev #61993 admin icons hid less text elements · 51f4e91c
  Laurent authored 7 years ago
  
  51f4e91c

Admin message

Master

Merge request reports

Activity