summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|\
| * Merge pull request #1138 from dokuwiki-translate/lang_update_16Andreas Gohr2015-05-07
| |\ | | | | | | Translation update (no)
| | * translation updateDanny Buckhof2015-05-07
| | |
| * | Merge pull request #1129 from splitbrain/remove-from-doku-prefsAndreas Gohr2015-05-07
| |\ \ | | |/ | |/| Make it possible to remove entries from DOKU_PREFS cookie
| | * make it possible to remove entries from DOKU_PREFS cookieAnika Henke2015-05-03
| | |
| * | Merge pull request #1132 from micgro42/linkWizPipeAndreas Gohr2015-05-07
| |\ \ | | | | | | | | Add pipe to end of link pasted without title
| | * | Add pipe to end of link pasted w/o titleMichael Große2015-05-05
| | |/ | | | | | | | | | | | | It is helpful if the pipe is still inserted by the linkwizard when there is no title. This increases usability for beginners.
| * | Merge pull request #1136 from tled/bcrypt_hashAndreas Gohr2015-05-07
| |\ \ | | | | | | | | mysqlauth: bcrypt hash is indicated by 2a or 2y
| | * | 2y is also used for bcrytTLed2015-05-06
| | | |
| * | | Merge pull request #1134 from ptbrown/auth-error-reportingAndreas Gohr2015-05-07
| |\ \ \ | | |/ / | |/| | Refactor error messages from auth plugins.
| | * | Fix scrutinizer issues with authPatrick Brown2015-05-07
| | | |
| | * | Error reporting for database auth pluginsPatrick Brown2015-05-06
| | | |
| | * | Report more meaningful errors when an auth backend fails. closes #1093Patrick Brown2015-05-06
| | |/
| * | Merge pull request #1133 from dokuwiki-translate/lang_update_5Anika Henke2015-05-06
| |\ \ | | |/ | |/| Translation update (nl)
| | * translation updateJohan Wijnker2015-05-05
| |/
* | 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
|/
* another yearAndreas Gohr2015-05-02
|
* Revert "use nav+ul element for "you are here""Andreas Gohr2015-05-02
| | | | | This reverts commit 3940c519db432ec22e8c587504d86191631f9bfb as discussed in #1082.
* Merge branch 'languagecleanup' of git://github.com/ptbrown/dokuwiki into ↵Andreas Gohr2015-05-02
|\ | | | | | | | | | | | | | | | | | | pull-request-1105 * 'languagecleanup' of git://github.com/ptbrown/dokuwiki: Remove no longer needed language string Delete unused div (Fixes #1098) Remove unused language strings Move language string to authad plugin
| * Remove no longer needed language stringPatrick Brown2015-04-04
| |
| * Merge branch 'authpwdexpire' into languagecleanupPatrick Brown2015-04-04
| |\
| | * Move language string to authad pluginPatrick Brown2015-03-31
| | |
| * | Delete unused div (Fixes #1098)Patrick Brown2015-04-03
| | |
| * | Remove unused language stringsPatrick Brown2015-04-03
| | |
* | | use string for version number. closes #1100Andreas Gohr2015-05-02
| | | | | | | | | | | | | | | | | | PHP will localize floats (eg. a 45.5 becomes 45,5 in a German locale). Using a string will prevent that. A fix has been applied on the server end, but it makes sense to always send the correct message.
* | | Merge pull request #1127 from dokuwiki-translate/lang_update_3Andreas Gohr2015-05-02
|\ \ \ | | | | | | | | Translation update (pt-br)
| * | | translation updateHudson FAS2015-04-28
|/ / /
* | | fixed allow_failures syntaxAndreas Gohr2015-04-25
| | |
* | | introduce new "flaky" test groupAndreas Gohr2015-04-25
| | | | | | | | | | | | this group is skipped by default
* | | new travis configAndreas Gohr2015-04-25
| | | | | | | | | | | | | | | test (but allow fails) against hhvm and PHP nightly (PHP7) builds remove phpunit pinning
* | | Merge pull request #1119 from anini/patch-3Andreas Gohr2015-04-25
|\ \ \ | | | | | | | | Adding Arabic Stopwords
| * | | Adding Arabic StopwordsMohammad Anini2015-04-19
| | | | | | | | | | | | Adding Arabic stopwords and keeping Engish stopwords as well, since most of the Arabic wikis contain a lot of English words.
* | | | Merge pull request #1121 from dokuwiki-translate/lang_update_49Andreas Gohr2015-04-25
|\ \ \ \ | | | | | | | | | | Translation update (uk)
| * | | | translation updateMax Lyashuk2015-04-19
| |/ / /
* | | | Merge pull request #1126 from dokuwiki-translate/lang_update_62Andreas Gohr2015-04-25
|\ \ \ \ | | | | | | | | | | Translation update (ru)
| * | | | translation updateAlex P2015-04-24
|/ / / /
* | | | Merge pull request #1125 from micgro42/linkwizCursorPosAndreas Gohr2015-04-23
|\ \ \ \ | | | | | | | | | | Linkwizard: Move cursor to the end of the text in input
| * | | | Add comment to explain purpose of folliwing linesMichael Große2015-04-23
| | | | |
| * | | | Move cursor to the end of the text in inputMichael Große2015-04-23
|/ / / /
* | | | Merge pull request #1122 from Epy/masterMichael Hamann2015-04-20
|\ \ \ \ | | | | | | | | | | 2 typo fixes in French translation
| * | | | 2 typo fixesYoven2015-04-19
|/ / / /
* / / / increased copyright year in wiki:dokuwikiAnika Henke2015-04-19
|/ / /
* | | Merge pull request #1116 from dokuwiki-translate/lang_update_47Andreas Gohr2015-04-17
|\ \ \ | | | | | | | | Translation update (lt)
| * | | translation updateTomas Darius Davainis2015-04-17
|/ / /