Merge remote-tracking branch 'origin/master' into remoteapiGetversions
Conflicts: lib/exe/xmlrpc.php
Showing
- _test/tests/inc/form/dropdownelement.test.php 35 additions, 0 deletions_test/tests/inc/form/dropdownelement.test.php
- _test/tests/inc/pageutils_clean_id.test.php 10 additions, 0 deletions_test/tests/inc/pageutils_clean_id.test.php
- _test/tests/inc/pageutils_wikiFN.test.php 17 additions, 0 deletions_test/tests/inc/pageutils_wikiFN.test.php
- inc/Form/CheckableElement.php 1 addition, 1 deletioninc/Form/CheckableElement.php
- inc/Form/DropdownElement.php 19 additions, 4 deletionsinc/Form/DropdownElement.php
- inc/Form/Element.php 1 addition, 1 deletioninc/Form/Element.php
- inc/Form/Form.php 26 additions, 26 deletionsinc/Form/Form.php
- inc/Form/TagCloseElement.php 5 additions, 5 deletionsinc/Form/TagCloseElement.php
- inc/Form/ValueElement.php 1 addition, 1 deletioninc/Form/ValueElement.php
- inc/config_cascade.php 1 addition, 0 deletionsinc/config_cascade.php
- inc/lang/fi/lang.php 3 additions, 1 deletioninc/lang/fi/lang.php
- inc/lang/hr/lang.php 1 addition, 1 deletioninc/lang/hr/lang.php
- inc/lang/ko/admin.txt 1 addition, 1 deletioninc/lang/ko/admin.txt
- inc/load.php 13 additions, 1 deletioninc/load.php
- inc/pageutils.php 9 additions, 8 deletionsinc/pageutils.php
- inc/parser/xhtml.php 10 additions, 0 deletionsinc/parser/xhtml.php
- lib/exe/js.php 48 additions, 14 deletionslib/exe/js.php
- lib/exe/mediamanager.php 2 additions, 1 deletionlib/exe/mediamanager.php
- lib/plugins/authad/adLDAP/classes/adLDAPUtils.php 11 additions, 7 deletionslib/plugins/authad/adLDAP/classes/adLDAPUtils.php
- lib/plugins/authad/lang/fi/lang.php 2 additions, 2 deletionslib/plugins/authad/lang/fi/lang.php
Loading
Please register or sign in to comment