Commits · 786cd4648d10fb5f99aa6fbd08e4e130b1cfc3f1 · afi / opacce

Apr 10, 2017
- collect strings · 786cd464
  Ghislain Loas authored 7 years ago
  
  786cd464
- version 7.9.11 · 9f77be8d
  Ghislain Loas authored 7 years ago
  
  9f77be8d
- Merge remote-tracking branch 'refs/remotes/origin/dev#57952_cip_priorisation_des_ecrans_de_config' · 0bf42121
  Ghislain Loas authored 7 years ago
```
Conflicts:
	library/ZendAfi/View/Helper/Admin/RenderForm.php
	public/admin/skins/bokeh74/colors.css
	public/admin/skins/bokeh74/global.css
```
  0bf42121
- Merge remote-tracking branch 'refs/remotes/origin/stable' · 10a1db04
  Ghislain Loas authored 7 years ago
  
  10a1db04
- dev #57952 fix tests failures · 7a00e4de
  Ghislain Loas authored 7 years ago
  
  7a00e4de
- dev #59152 fix fonctionnal tests + tests failures · bc9baad2
  Ghislain Loas authored 7 years ago
  
  bc9baad2
- dev #57952 fix tests failures · dd228dc7
  Ghislain Loas authored 7 years ago
  
  dd228dc7
- Merge branch 'dev#59152_videos_de_bokeh_dans_l_admin' · b0a37cc6
  Ghislain Loas authored 7 years ago
```
Conflicts:
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css
	public/admin/skins/retro/global.css
```
  b0a37cc6
- Merge remote-tracking branch 'refs/remotes/origin/dev#48349_ux_versionning' · 6ee36e11
  Ghislain Loas authored 7 years ago
  
  6ee36e11
- dev #57952 fix admin validation URL · 981ee1c1
  Ghislain Loas authored 7 years ago
  
  981ee1c1
- dev #59152 fix html5 · 5634eebb
  Ghislain Loas authored 7 years ago
  
  5634eebb
- dev #59152 fix tests failures · 4fe5722f
  Ghislain Loas authored 7 years ago
  
  4fe5722f
- dev #59152 add video to admin home · c3492a11
  Ghislain Loas authored 7 years ago
  
  c3492a11
Apr 08, 2017
- CIP #57952 improve popup opening and revive resize · 1ab86fd9
  Ghislain Loas authored 7 years ago
  
  1ab86fd9
- CIP #57952 improve add loading submodal js · 2ca2e981
  Ghislain Loas authored 7 years ago
  
  2ca2e981
- CIP #57952 fix tests failures · 7383c73a
  Ghislain Loas authored 7 years ago
  
  7383c73a
- CIP #57952 add continue button + improve edition ihm · 47085af7
  Ghislain Loas authored 7 years ago
  
  47085af7
Apr 07, 2017
- CIP #57952 improve menu_conf css · bac7bd7c
  Ghislain Loas authored 7 years ago
  
  bac7bd7c
- CIP #57952 fix rt comments · d6d6746e
  Ghislain Loas authored 7 years ago
  
  d6d6746e
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 22c13106
  Ghislain Loas authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into dev#57952_cip_priorisation_des_ecrans_de_config
```
  22c13106
- CIP #57952 fix rt comments · 9e0c5bc3
  Ghislain Loas authored 7 years ago
  
  9e0c5bc3
- CIP #57952 improve edition background · 24968488
  Ghislain Loas authored 7 years ago
  
  24968488
- CIP #57952 add tests to delete-menu · b5a20e5b
  Ghislain Loas authored 7 years ago
  
  b5a20e5b
- CIP #57952 fix rt comments · bc837b3b
  Ghislain Loas authored 7 years ago
  
  bc837b3b
- CIP #57952 fix tests failrues · 951ff562
  Ghislain Loas authored 7 years ago
  
  951ff562
- CIP #57952 fix issue with vertical menu sub menus · 927f2ff8
  Ghislain Loas authored 7 years ago
  
  927f2ff8
- Merge branch 'hotline#59056_compte_sysadm_visible_par_tous_les_admin_portail' into 'stable' · 371b4498
  Patrick Barroca authored 7 years ago
```
hotline #59056 : user administration limited to current role level and under

See merge request !2110
```
  371b4498
- hotline #59056 : fix rt · 0f7bc64c
  Patrick Barroca authored 7 years ago
  
  0f7bc64c
- dev #48349 : fix rt · 7f40d031
  Patrick Barroca authored 7 years ago
  
  7f40d031
Apr 06, 2017
- CIP #57952 fix tests failures · 8d533205
  Ghislain Loas authored 7 years ago
  
  8d533205
- CIP #57952 rename link to my selections · ccff61c9
  Ghislain Loas authored 7 years ago
  
  ccff61c9
- CIP #57952 fix multiple bugs · e47e5069
  Ghislain Loas authored 7 years ago
  
  e47e5069
- dev #48349 : fix empty multicheckbox customfield comparison · 246ca5cc
  Patrick Barroca authored 7 years ago
  
  246ca5cc
- hotline #59056 : user administration limited to current role level and under · b2d714d7
  Patrick Barroca authored 7 years ago
  
  b2d714d7
- fix failure · 856eea44
  Patrick Barroca authored 7 years ago
  
  856eea44
- Merge remote-tracking branch 'refs/remotes/afi/hotline-master' into afi-master · 69f15445
  Patrick Barroca authored 7 years ago
```
# Conflicts:
#	cosmogramme/sql/patch/patch_322.php
#	tests/db/UpgradeDBTest.php
```
  69f15445
- CIP #57952 fix offset issues while opening dialog and scrolling · 1faf80b9
  Ghislain Loas authored 7 years ago
  
  1faf80b9
- CIP #57952 improve popup rendering · 2fbafc1e
  Ghislain Loas authored 7 years ago
  
  2fbafc1e
- CIP #57952 fix popup rendering · fba54190
  Ghislain Loas authored 7 years ago
  
  fba54190
- CIP #57952 fix rt comments · 2810c05c
  Ghislain Loas authored 7 years ago
  
  2810c05c

Admin message