Merge branch 'origin-hotline' into origin-master
# Conflicts: # tests/scenarios/Templates/TemplatesMenuTest.php
Branches
Tags
Showing
- VERSIONS_HOTLINE/131892 1 addition, 0 deletionsVERSIONS_HOTLINE/131892
- VERSIONS_HOTLINE/133092 1 addition, 0 deletionsVERSIONS_HOTLINE/133092
- VERSIONS_HOTLINE/140058 1 addition, 0 deletionsVERSIONS_HOTLINE/140058
- library/ZendAfi/View/Helper/Admin/Nav.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Admin/Nav.php
- library/templates/Intonation/Assets/Bootstrap/bootstrap-4.3.1-dist/js/tests/dropdown_tests.html 69 additions, 0 deletions...otstrap/bootstrap-4.3.1-dist/js/tests/dropdown_tests.html
- library/templates/Intonation/Assets/Bootstrap/bootstrap-4.3.1-dist/js/tests/dropdown_tests.js 35 additions, 0 deletions...Bootstrap/bootstrap-4.3.1-dist/js/tests/dropdown_tests.js
- library/templates/Intonation/Library/View/Wrapper/MenuEntry.php 6 additions, 0 deletions...y/templates/Intonation/Library/View/Wrapper/MenuEntry.php
- library/templates/Intonation/View/Menu/Abstract.php 3 additions, 1 deletionlibrary/templates/Intonation/View/Menu/Abstract.php
- library/templates/Intonation/View/RenderMenuEntry.php 3 additions, 5 deletionslibrary/templates/Intonation/View/RenderMenuEntry.php
- public/admin/js/treeselect/test.js 160 additions, 0 deletionspublic/admin/js/treeselect/test.js
- public/admin/js/treeselect/tests.html 42 additions, 0 deletionspublic/admin/js/treeselect/tests.html
- public/admin/js/treeselect/treeselect.js 14 additions, 15 deletionspublic/admin/js/treeselect/treeselect.js
- tests/application/modules/admin/controllers/IndexControllerTest.php 12 additions, 0 deletions...ication/modules/admin/controllers/IndexControllerTest.php
- tests/bootstrap.php 1 addition, 0 deletionstests/bootstrap.php
- tests/js/AuthorityPickerTest.php 3 additions, 9 deletionstests/js/AuthorityPickerTest.php
- tests/js/BootstrapDropdownTest.php 25 additions, 0 deletionstests/js/BootstrapDropdownTest.php
- tests/js/CustomFieldsReportTest.php 4 additions, 9 deletionstests/js/CustomFieldsReportTest.php
- tests/js/MultiInputTest.php 4 additions, 9 deletionstests/js/MultiInputTest.php
- tests/js/MultiSelectionTest.php 4 additions, 9 deletionstests/js/MultiSelectionTest.php
- tests/js/PhantomJsTest.php 52 additions, 0 deletionstests/js/PhantomJsTest.php
Please register or sign in to comment