Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #945 from splitbrain/scrutinizerissues | Andreas Gohr | 2014-12-09 |
|\ | | | | | Scrutinizer issues and IXR library updates | ||
| * | Merge remote-tracking branch 'origin/master' into scrutinizerissues | Gerrit Uitslag | 2014-12-09 |
| |\ | |/ |/| | | | | | | | | | | | | | Conflicts: inc/media.php inc/plugin.php inc/template.php lib/plugins/authplain/_test/escaping.test.php lib/plugins/syntax.php | ||
* | | Merge pull request #943 from dokuwiki-translate/lang_update_56 | Andreas Gohr | 2014-12-09 |
|\ \ | | | | | | | Translation update (fa) | ||
| * | | translation update | Omid Hezaveh | 2014-12-08 |
|/ / | |||
* | | Increasing master branch updateVersion number | Guy Brand | 2014-12-06 |
| | | |||
* | | Increase updateVersion for master to sync with stable hotfix | Guy Brand | 2014-12-04 |
| | | |||
* | | warn about enabled, but not used auth plugins | Andreas Gohr | 2014-12-03 |
| | | |||
* | | Merge remote-tracking branch 'origin/master' | Gerrit Uitslag | 2014-12-03 |
|\ \ | |||
| * | | disable flash uploading by default | Andreas Gohr | 2014-12-02 |
| | | | | | | | | | | | | Thanks to Kacper Szurek for reporting this | ||
| * | | Merge pull request #940 from splitbrain/listnode2 | Andreas Gohr | 2014-12-02 |
| |\ \ | | | | | | | | | Provide node/leaf state data in instructions | ||
| | * | | update parser tests for change in listitem_open instruction | Christopher Smith | 2014-12-01 |
| | | | | |||
| | * | | Update inbuilt renderers for node/leaf state in listitem_open | Christopher Smith | 2014-12-01 |
| | | | | | | | | | | | | | | | | | | | | - includes, xhtml renderer adding 'node' class to <li> when it contains child list(s) | ||
| | * | | provide node/leaf state data in listitem_open instruction parameter | Christopher Smith | 2014-12-01 |
| |/ / | |||
| * | | Merge pull request #939 from dokuwiki-translate/lang_update_48 | Andreas Gohr | 2014-11-27 |
| |\ \ | | | | | | | | | Translation update (fa) | ||
| | * | | translation update | Mohammad Sadegh | 2014-11-27 |
| |/ / | |||
| * | | Merge pull request #932 from dokuwiki-translate/lang_update_30 | Andreas Gohr | 2014-11-24 |
| |\ \ | | | | | | | | | Translation update (fr) | ||
| | * | | translation update | james | 2014-11-19 |
| | | | | |||
| * | | | Merge pull request #933 from dokuwiki-translate/lang_update_31 | Andreas Gohr | 2014-11-24 |
| |\ \ \ | | | | | | | | | | | Translation update (no) | ||
| | * | | | translation update | Patrick | 2014-11-19 |
| | |/ / | |||
| * | | | Merge pull request #935 from dokuwiki-translate/lang_update_35 | Andreas Gohr | 2014-11-24 |
| |\ \ \ | | |/ / | |/| | | Translation update (cs) | ||
| | * | | translation update | Jaroslav Lichtblau | 2014-11-21 |
| |/ / | |||
* | | | phpdocs syntax plugin base class | Gerrit Uitslag | 2014-12-03 |
| | | | |||
* | | | code reformatting tpl_content_core() | Gerrit Uitslag | 2014-12-03 |
| | | | |||
* | | | phpdocs handler | Gerrit Uitslag | 2014-12-03 |
| | | | |||
* | | | provide also $ID in other export modes to renderer | Gerrit Uitslag | 2014-12-03 |
| | | | | | | | | | | | | Simplifies modifying the cache via an action plugin | ||
* | | | code formatting cache | Gerrit Uitslag | 2014-12-03 |
|/ / | |||
* | | Merge pull request #926 from micgro42/trimSlashes | Andreas Gohr | 2014-11-11 |
|\ \ | | | | | | | Trim unnecessary / at start of windowssharelink | ||
| * | | Trim unnecessary / at start of windowssharelink | Michael Große | 2014-11-11 |
|/ / | |||
* | | Merge pull request #917 from danny0838/master | Andreas Gohr | 2014-11-03 |
|\ \ | | | | | | | Fixed a bug that $conf['compression'] is turned off when gzopen doesn't exist and gzopen64 does exist. | ||
| * | | Move check after libraries are loaded, so that $conf['compression'] is not ↵ | Danny Lin | 2014-10-31 |
|/ / | | | | | | | turned off in the case that gzopen doesn't exist while gzopen64 does exist, as inc/compatibility.php ought to have fixed. | ||
* | | Merge pull request #907 from Rillke/master | Andreas Gohr | 2014-10-27 |
|\ \ | | | | | | | Accept some new gTLD e-Mail addresses | ||
| * | | Accept some new gTLD e-Mail addresses | Rainer Rillke | 2014-10-17 |
| | | | | | | | | | | | | | | | | | | by allowing longer TLDs (up to 63 characters, which is the DN maximum: https://tools.ietf.org/html/rfc1034): "Each node has a label, which is zero to 63 octets in length." For an up-to-date-length, see http://stackoverflow.com/a/22038535 | ||
* | | | Merge pull request #912 from dokuwiki-translate/lang_update_85 | Andreas Gohr | 2014-10-27 |
|\ \ \ | | | | | | | | | Translation update (zh-tw) | ||
| * | | | translation update | lioujheyu | 2014-10-27 |
| | | | | |||
* | | | | Merge pull request #913 from dokuwiki-translate/lang_update_86 | Andreas Gohr | 2014-10-27 |
|\ \ \ \ | |/ / / |/| | | | Translation update (de) | ||
| * | | | translation update | Pascal Schröder | 2014-10-27 |
|/ / / | |||
* | | | Merge pull request #910 from dokuwiki-translate/lang_update_77 | Andreas Gohr | 2014-10-25 |
|\ \ \ | | | | | | | | | Translation update (cs) | ||
| * | | | translation update | Jaroslav Lichtblau | 2014-10-22 |
|/ / / | |||
* | | | Merge pull request #909 from splitbrain/visibilityDokuCssFile | Andreas Gohr | 2014-10-22 |
|\ \ \ | | | | | | | | | visibility from private to protected for DokuCssFile | ||
| * | | | visibility from private to protected for DokuCssFile | Gerrit Uitslag | 2014-10-22 |
|/ / / | |||
* | | | use phpdocs deprecated notation | Gerrit Uitslag | 2014-10-21 |
| | | | |||
* | | | Merge pull request #908 from dokuwiki-translate/lang_update_73 | Andreas Gohr | 2014-10-20 |
|\ \ \ | | | | | | | | | Translation update (ru) | ||
| * | | | translation update | Aleksandr Selivanov | 2014-10-18 |
|/ / / | |||
* | | | -k requires parameter. fixes #902 | Andreas Gohr | 2014-10-17 |
| | | | |||
* | | | Merge pull request #903 from LarsGit223/master | Andreas Gohr | 2014-10-17 |
|\ \ \ | |/ / |/| | | Fixed unrecognized regular expressions behind '&&' or '||' operators in JavaScript compression. Finally fixes #897. | ||
| * | | Ooops...forgot to commit test cases for #897. | LarsDW223 | 2014-10-15 |
| | | | |||
| * | | Fixed JavaScript compression. The compressor did not recognize a regular ↵ | LarsDW223 | 2014-10-15 |
| | | | | | | | | | | | | expression after a '&&' ot '||' operator. So it could happen that code had been cut off if the regular expression included '\//' (which was treated as a single line comment because of the regular expression not being recognized). Finally fixes #897. | ||
* | | | Merge pull request #905 from dokuwiki-translate/lang_update_70 | Andreas Gohr | 2014-10-16 |
|\ \ \ | | | | | | | | | Translation update (eu) | ||
| * | | | translation update | Yadav Gowda | 2014-10-15 |
|/ / / | |||
* | | | new PHP minimum requirement is now 5.3.3 | Andreas Gohr | 2014-10-14 |
| | | | | | | | | | | | | that's the version in Debian old stable |