Merge branch 'master' into future
* master: (162 commits) fixed revision JS for images upgraded SimplePie to 1.3.1 FS#2708 removed obsolete browser plugin (migrate does it) adjust spacing to match standard 1.4em grid added comment on use of whitelist vs blacklist Updated idfilter() function for IIS use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found. added 'home' class to first link in hierarchical breadcrumbs reduced required max width to go into tablet mode re-added linear gradients for firefox added missing styling for disabled form elements (FS#2705) fixed acronyms in italics (FS#2684) improved print styles (includes fixes for FS#2645 and FS#2707) basic styles improvements Greek language update Use list in acl help text, for more structure Galician language update touch the config on save, even if no changes were made unwind the width narrowing commit put some whitespace between form submit button and fieldset bottom border ... Conflicts: lib/plugins/config/admin.php lib/plugins/config/settings/config.class.php
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- README 1 addition, 1 deletionREADME
- _test/core/DokuWikiTest.php 2 additions, 0 deletions_test/core/DokuWikiTest.php
- _test/phpunit.xml 4 additions, 0 deletions_test/phpunit.xml
- _test/tests/inc/auth_aclcheck.test.php 3 additions, 7 deletions_test/tests/inc/auth_aclcheck.test.php
- _test/tests/inc/auth_aclcheck_caseinsensitive.test.php 128 additions, 0 deletions_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
- _test/tests/inc/auth_admincheck.test.php 2 additions, 3 deletions_test/tests/inc/auth_admincheck.test.php
- _test/tests/inc/auth_nameencode.test.php 1 addition, 1 deletion_test/tests/inc/auth_nameencode.test.php
- _test/tests/inc/auth_password.test.php 6 additions, 0 deletions_test/tests/inc/auth_password.test.php
- _test/tests/inc/httpclient_http_proxy.test.php 20 additions, 0 deletions_test/tests/inc/httpclient_http_proxy.test.php
- _test/tests/inc/httpclient_https.test.php 1 addition, 0 deletions_test/tests/inc/httpclient_https.test.php
- _test/tests/inc/httpclient_https_proxy.test.php 15 additions, 0 deletions_test/tests/inc/httpclient_https_proxy.test.php
- _test/tests/inc/indexer_pid.test.php 18 additions, 0 deletions_test/tests/inc/indexer_pid.test.php
- _test/tests/inc/indexer_rename.test.php 83 additions, 0 deletions_test/tests/inc/indexer_rename.test.php
- _test/tests/inc/mailer.test.php 20 additions, 0 deletions_test/tests/inc/mailer.test.php
- _test/tests/inc/parser/parser.inc.php 2 additions, 1 deletion_test/tests/inc/parser/parser.inc.php
- _test/tests/inc/parser/parser_footnote.test.php 2 additions, 2 deletions_test/tests/inc/parser/parser_footnote.test.php
- _test/tests/inc/parser/parser_quotes.test.php 2 additions, 2 deletions_test/tests/inc/parser/parser_quotes.test.php
- _test/tests/inc/remote.test.php 1 addition, 4 deletions_test/tests/inc/remote.test.php
- _test/tests/inc/search/search.test.php 19 additions, 0 deletions_test/tests/inc/search/search.test.php
Loading
Please register or sign in to comment