Merge branch 'hotline-master' into 'master'
Hotline master See merge request !1536
Branches
Tags
Showing
- VERSIONS_HOTLINE/37169 1 addition, 0 deletionsVERSIONS_HOTLINE/37169
- VERSIONS_HOTLINE/37405 1 addition, 0 deletionsVERSIONS_HOTLINE/37405
- VERSIONS_HOTLINE/38194 1 addition, 0 deletionsVERSIONS_HOTLINE/38194
- cosmogramme/php/classes/classe_notice_integration.php 8 additions, 14 deletionscosmogramme/php/classes/classe_notice_integration.php
- cosmogramme/sql/patch/patch_289.php 7 additions, 0 deletionscosmogramme/sql/patch/patch_289.php
- cosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php 52 additions, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php
- library/Class/CodifTags.php 16 additions, 4 deletionslibrary/Class/CodifTags.php
- library/ZendAfi/View/Helper/Admin/SearchUsers.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Admin/SearchUsers.php
- library/ZendAfi/View/Helper/Bouton.php 1 addition, 2 deletionslibrary/ZendAfi/View/Helper/Bouton.php
- library/ZendAfi/View/Helper/RenderForm.php 4 additions, 7 deletionslibrary/ZendAfi/View/Helper/RenderForm.php
- public/admin/css/global.css 8 additions, 1 deletionpublic/admin/css/global.css
- public/admin/skins/bokeh74/colors/blue.css 2 additions, 1 deletionpublic/admin/skins/bokeh74/colors/blue.css
- public/admin/skins/bokeh74/colors/green.css 2 additions, 1 deletionpublic/admin/skins/bokeh74/colors/green.css
- public/admin/skins/bokeh74/colors/orange.css 2 additions, 1 deletionpublic/admin/skins/bokeh74/colors/orange.css
- public/admin/skins/bokeh74/colors/purple.css 2 additions, 1 deletionpublic/admin/skins/bokeh74/colors/purple.css
- public/admin/skins/bokeh74/colors/red.css 2 additions, 1 deletionpublic/admin/skins/bokeh74/colors/red.css
- public/admin/skins/bokeh74/colors/solarized_dark.css 10 additions, 0 deletionspublic/admin/skins/bokeh74/colors/solarized_dark.css
- public/admin/skins/bokeh74/global.css 23 additions, 6 deletionspublic/admin/skins/bokeh74/global.css
- public/admin/skins/retro/global.css 17 additions, 1 deletionpublic/admin/skins/retro/global.css
- tests/application/modules/admin/controllers/CmsControllerTest.php 2 additions, 2 deletions...plication/modules/admin/controllers/CmsControllerTest.php
Please register or sign in to comment