Merge branch 'hotline-master' into 'master'
Hotline master See merge request !1191
Showing
- VERSIONS 19 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/27768 0 additions, 4 deletionsVERSIONS_HOTLINE/27768
- application/modules/admin/controllers/UsersController.php 1 addition, 2 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/users/_form.phtml 21 additions, 10 deletionsapplication/modules/admin/views/scripts/users/_form.phtml
- ckeditor/core_five_filemanager/connectors/php/filemanager.php 12 additions, 16 deletions...itor/core_five_filemanager/connectors/php/filemanager.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_273.php 2 additions, 2 deletionscosmogramme/sql/patch/patch_273.php
- cosmogramme/sql/patch/patch_275.php 4 additions, 0 deletionscosmogramme/sql/patch/patch_275.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 33 additions, 4 deletions...ication/modules/admin/controllers/UsersControllerTest.php
- tests/application/modules/opac/controllers/ead.xsd 1 addition, 1 deletiontests/application/modules/opac/controllers/ead.xsd
- tests/application/modules/opac/controllers/xlink.xsd 75 additions, 0 deletionstests/application/modules/opac/controllers/xlink.xsd
- tests/db/UpgradeDBTest.php 27 additions, 0 deletionstests/db/UpgradeDBTest.php
Please register or sign in to comment