Merge remote-tracking branch 'origin/master' into video-audio
Conflicts: inc/parser/xhtml.php
No related branches found
No related tags found
Showing
- _cs/DokuWiki/ruleset.xml 6 additions, 1 deletion_cs/DokuWiki/ruleset.xml
- _test/bootstrap.php 9 additions, 1 deletion_test/bootstrap.php
- _test/data/meta/mailinglist.changes 24 additions, 0 deletions_test/data/meta/mailinglist.changes
- _test/data/pages/mailinglist.txt 11 additions, 0 deletions_test/data/pages/mailinglist.txt
- _test/tests/inc/auth_loadacl.test.php 130 additions, 0 deletions_test/tests/inc/auth_loadacl.test.php
- _test/tests/inc/auth_nameencode.test.php 28 additions, 0 deletions_test/tests/inc/auth_nameencode.test.php
- _test/tests/inc/changelog_getrevisioninfo.test.php 120 additions, 0 deletions_test/tests/inc/changelog_getrevisioninfo.test.php
- _test/tests/inc/changelog_getrevisions.test.php 200 additions, 0 deletions_test/tests/inc/changelog_getrevisions.test.php
- _test/tests/inc/fulltext_backlinks.test.php 9 additions, 1 deletion_test/tests/inc/fulltext_backlinks.test.php
- _test/tests/inc/fulltext_mediause.test.php 7 additions, 0 deletions_test/tests/inc/fulltext_mediause.test.php
- _test/tests/inc/httpclient_http_proxy.test.php 2 additions, 2 deletions_test/tests/inc/httpclient_http_proxy.test.php
- _test/tests/inc/indexer_indexing.test.php 45 additions, 0 deletions_test/tests/inc/indexer_indexing.test.php
- _test/tests/inc/mailer.test.php 66 additions, 3 deletions_test/tests/inc/mailer.test.php
- _test/tests/inc/pageutils_clean_id.test.php 3 additions, 0 deletions_test/tests/inc/pageutils_clean_id.test.php
- _test/tests/inc/parser/parser_table.test.php 58 additions, 0 deletions_test/tests/inc/parser/parser_table.test.php
- _test/tests/inc/parserutils_set_metadata_during_rendering.test.php 1 addition, 1 deletion...ts/inc/parserutils_set_metadata_during_rendering.test.php
- _test/tests/inc/subscription.test.php 1 addition, 1 deletion_test/tests/inc/subscription.test.php
- _test/tests/lib/exe/css_css_compress.test.php 40 additions, 0 deletions_test/tests/lib/exe/css_css_compress.test.php
- bin/dwpage.php 4 additions, 4 deletionsbin/dwpage.php
- bin/striplangs.php 1 addition, 1 deletionbin/striplangs.php
Loading
Please register or sign in to comment