Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php tests/db/UpgradeDBTest.php
Showing
- VERSIONS 20 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/CmsController.php 8 additions, 1 deletionapplication/modules/admin/controllers/CmsController.php
- library/Class/Migration/CiteDeLaMusiqueBecomesPhilharmonieDeParis.php 1 addition, 1 deletion...s/Migration/CiteDeLaMusiqueBecomesPhilharmonieDeParis.php
- library/Class/Notice.php 4 additions, 9 deletionslibrary/Class/Notice.php
- library/Class/Ouverture.php 11 additions, 0 deletionslibrary/Class/Ouverture.php
- library/Class/Ouverture/Visitor.php 1 addition, 2 deletionslibrary/Class/Ouverture/Visitor.php
- library/Class/Systeme/Widget/Abstract.php 3 additions, 3 deletionslibrary/Class/Systeme/Widget/Abstract.php
- library/Class/UserGroupCategorie.php 42 additions, 15 deletionslibrary/Class/UserGroupCategorie.php
- library/ZendAfi/Controller/Plugin/Manager/Article.php 2 additions, 0 deletionslibrary/ZendAfi/Controller/Plugin/Manager/Article.php
- library/ZendAfi/Controller/Plugin/Manager/UserGroup.php 16 additions, 7 deletionslibrary/ZendAfi/Controller/Plugin/Manager/UserGroup.php
- library/ZendAfi/Form/Admin/UserGroup.php 4 additions, 1 deletionlibrary/ZendAfi/Form/Admin/UserGroup.php
- library/ZendAfi/Form/UserGroupCategorie.php 18 additions, 9 deletionslibrary/ZendAfi/Form/UserGroupCategorie.php
- library/ZendAfi/View/Helper/LibraryOpenings.php 4 additions, 5 deletionslibrary/ZendAfi/View/Helper/LibraryOpenings.php
- library/storm 1 addition, 1 deletionlibrary/storm
- public/opac/java/on_form_change_do/on_form_change_do.js 6 additions, 11 deletionspublic/opac/java/on_form_change_do/on_form_change_do.js
- tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php 33 additions, 1 deletion...dules/admin/controllers/CmsControllerCustomFieldsTest.php
- tests/application/modules/admin/controllers/CmsControllerListModeTest.php 19 additions, 2 deletions...n/modules/admin/controllers/CmsControllerListModeTest.php
- tests/application/modules/admin/controllers/CmsControllerTest.php 33 additions, 3 deletions...plication/modules/admin/controllers/CmsControllerTest.php
- tests/application/modules/admin/controllers/UserGroupControllerTest.php 122 additions, 17 deletions...ion/modules/admin/controllers/UserGroupControllerTest.php
- tests/application/modules/opac/controllers/AuthControllerTest.php 5 additions, 5 deletions...plication/modules/opac/controllers/AuthControllerTest.php
Please register or sign in to comment