summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into stylerAnika Henke2015-07-25
|\ | | | | | | | | Conflicts: lib/exe/css.php
| * Merge pull request #1251 from trebmuh/patch-1Anika Henke2015-07-25
| |\ | | | | | | Update lang.php - missing FR translation for 2 options
| | * Update lang.phptrebmuh2015-07-25
| |/ | | | | | | Please someone who know the code, double check this one. It does look that translation for 2 options were missing.
| * use new container infrastructure on TravisAndreas Gohr2015-07-24
| | | | | | | | See http://docs.travis-ci.com/user/migrating-from-legacy
| * skip sha512 tests when it's not availableAndreas Gohr2015-07-24
| | | | | | | | | | | | | | | | This makes the entire testsuite run through on HHVM 3.8.0 on phpunit beta-2015-06-18 :-) Note: this does not mean that DokuWiki is fully compatible with HHVM, but it's a good step!
| * avoid errors on trying to read corrupt gzip filesAndreas Gohr2015-07-24
| |
| * fixed #1249 by upgrading php-archive to 1.0.4Andreas Gohr2015-07-24
| |
| * Revert "Additionally allow more media types" #982Andreas Gohr2015-07-24
| | | | | | | | This reverts commit de4634ec87b1a277c1686990d993dafc43db05ed.
| * Merge pull request #1247 from splitbrain/interwiki-fixesAndreas Gohr2015-07-24
| |\ | | | | | | Interwiki fixes
| | * Remove splitbrain.org interwiki linkPatrick Brown2015-07-23
| | |
| | * Document all options in the interwiki configPatrick Brown2015-07-22
| | |
| | * Remove non-functioning interwiki linksPatrick Brown2015-07-22
| | |
| | * Encode unsafe characters in interwiki links. closes #1220Patrick Brown2015-07-16
| | |
| | * Unit test for interwiki URL encoding bugPatrick Brown2015-07-16
| | |
| | * Change interwiki links to HTTPSPatrick Brown2015-07-16
| | |
| * | Merge pull request #1245 from dokuwiki-translate/lang_update_132Andreas Gohr2015-07-22
| |\ \ | | | | | | | | Translation update (de)
| | * | translation updatePhilip Knack2015-07-22
| |/ /
| * | Merge pull request #1242 from dokuwiki-translate/lang_update_129Andreas Gohr2015-07-20
| |\ \ | | | | | | | | Translation update (de)
| | * | translation updatePhilip Knack2015-07-20
| |/ /
| * | Merge pull request #1239 from RnBConsulting/masterAndreas Gohr2015-07-18
| |\ \ | | | | | | | | Add a 'returnonly' option to all xhtml link types
| | * | Add a 'returnonly' option to all xhtml link typesAndreas Böhler2015-07-15
| | | |
| * | | Merge pull request #1159 from splitbrain/morephp7Andreas Gohr2015-07-18
| |\ \ \ | | | | | | | | | | More php7 improvements
| | * | | __constructGerrit Uitslag2015-05-16
| | | | |
| | * | | PHPDocsGerrit Uitslag2015-05-16
| | | | |
| | * | | var declaration, static declarationGerrit Uitslag2015-05-16
| | | | |
| | * | | update to __constructGerrit Uitslag2015-05-16
| | | | |
| * | | | Merge pull request #1176 from splitbrain/ioreplaceinfileAndreas Gohr2015-07-18
| |\ \ \ \ | | | | | | | | | | | | Add IO function to replace lines in a file (new)
| | * | | | Rephrase description of io_replaceInFiles to be clarify use of regexPatrick Brown2015-05-29
| | | | | |
| | * | | | Abort io_replaceInLine when the search parameter is emptyPatrick Brown2015-05-29
| | | | | |
| | * | | | Minor RefactoringChristopher Smith2015-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - put test comments in more appropriate spot - move appending replacement line alongside its search/delete code
| | * | | | add anchors when constructing pattern from a non-regex oldlineChristopher Smith2015-05-29
| | | | | |
| | * | | | Merge branch 'master' into ioreplaceinfileChristopher Smith2015-05-28
| | |\ \ \ \
| | * | | | | Refactor code to make it simpler.Christopher Smith2015-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes should also: - fix unlikely edge case when replacement line is the same as the old line (would have resulted in timeout) - reduce memory footprint - avoid applying string search beyond maxlines replacement limit
| | * | | | | Fix variable name typoPatrick Brown2015-05-08
| | | | | | |
| | * | | | | Don't run redundant testsPatrick Brown2015-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | io_deleteFromFile is a special case of io_replaceInFile. Since the io_replace tests check compressed files, it doesn't have to be done in the io_delete test.
| | * | | | | Limit number of lines to replace.Patrick Brown2015-05-08
| | | | | | |
| | * | | | | Merge branch 'master' into ioreplaceinfilePatrick Brown2015-05-07
| | |\ \ \ \ \
| | * | | | | | Use io_replaceInFile for updating authPatrick Brown2015-05-07
| | | | | | | |
| | * | | | | | Add io_replaceInFilePatrick Brown2015-05-07
| | | | | | | |
| | * | | | | | Deleting lines works with BZ2 files.Patrick Brown2015-05-06
| | | | | | | |
| | * | | | | | Append to BZip2 files. Unit tests for writing files.Patrick Brown2015-05-06
| | | | | | | |
| * | | | | | | remote.testiamchenxin2015-07-18
| | | | | | | |
| * | | | | | | add a Exception in hasAccess()iamchenxin2015-07-18
| | | | | | | |
| * | | | | | | correctly handle usergroups arraySascha Klopp2015-07-18
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | improve aria attribute handling. closes #1142Andreas Gohr2015-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adds aria handling to makeToggle and allows to supress it in dw_toggle
| * | | | | | remove pragma:no-cache header. closes #1201Andreas Gohr2015-07-15
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The pragma header is only defined for requests not for responses. The Cache-Control header should be used in responses.
| * | | | | Merge pull request #1238 from dokuwiki-translate/lang_update_111Andreas Gohr2015-07-15
| |\ \ \ \ \ | | | | | | | | | | | | | | Translation update (ja)
| | * | | | | translation updateHideaki SAWADA2015-07-15
| | | | | | |
| * | | | | | Merge pull request #1229 from araname/masterAndreas Gohr2015-07-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | adjust newline in intro.txt at config
| | * | | | | | adjust newlineMyeongjin2015-07-11
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 15:26:42 +0000