summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into scrutinizerissuesGerrit Uitslag2014-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_56Andreas Gohr2014-12-09
| |\ | | | | | | Translation update (fa)
| | * translation updateOmid Hezaveh2014-12-08
| |/
| * Increasing master branch updateVersion numberGuy Brand2014-12-06
| |
| * Increase updateVersion for master to sync with stable hotfixGuy Brand2014-12-04
| |
| * warn about enabled, but not used auth pluginsAndreas Gohr2014-12-03
| |
| * Merge remote-tracking branch 'origin/master'Gerrit Uitslag2014-12-03
| |\
| | * disable flash uploading by defaultAndreas Gohr2014-12-02
| | | | | | | | | | | | Thanks to Kacper Szurek for reporting this
| | * Merge pull request #940 from splitbrain/listnode2Andreas Gohr2014-12-02
| | |\ | | | | | | | | Provide node/leaf state data in instructions
| | | * update parser tests for change in listitem_open instructionChristopher Smith2014-12-01
| | | |
| | | * Update inbuilt renderers for node/leaf state in listitem_openChristopher Smith2014-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 parameterChristopher Smith2014-12-01
| | |/
| | * Merge pull request #939 from dokuwiki-translate/lang_update_48Andreas Gohr2014-11-27
| | |\ | | | | | | | | Translation update (fa)
| | | * translation updateMohammad Sadegh2014-11-27
| | |/
| | * Merge pull request #932 from dokuwiki-translate/lang_update_30Andreas Gohr2014-11-24
| | |\ | | | | | | | | Translation update (fr)
| | | * translation updatejames2014-11-19
| | | |
| | * | Merge pull request #933 from dokuwiki-translate/lang_update_31Andreas Gohr2014-11-24
| | |\ \ | | | | | | | | | | Translation update (no)
| | | * | translation updatePatrick2014-11-19
| | | |/
| | * | Merge pull request #935 from dokuwiki-translate/lang_update_35Andreas Gohr2014-11-24
| | |\ \ | | | |/ | | |/| Translation update (cs)
| | | * translation updateJaroslav Lichtblau2014-11-21
| | |/
| * | phpdocs syntax plugin base classGerrit Uitslag2014-12-03
| | |
| * | code reformatting tpl_content_core()Gerrit Uitslag2014-12-03
| | |
| * | phpdocs handlerGerrit Uitslag2014-12-03
| | |
| * | provide also $ID in other export modes to rendererGerrit Uitslag2014-12-03
| | | | | | | | | | | | Simplifies modifying the cache via an action plugin
| * | code formatting cacheGerrit Uitslag2014-12-03
| |/
| * Merge pull request #926 from micgro42/trimSlashesAndreas Gohr2014-11-11
| |\ | | | | | | Trim unnecessary / at start of windowssharelink
| | * Trim unnecessary / at start of windowssharelinkMichael Große2014-11-11
| |/
| * Merge pull request #917 from danny0838/masterAndreas Gohr2014-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 Lin2014-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/masterAndreas Gohr2014-10-27
| |\ | | | | | | Accept some new gTLD e-Mail addresses
| | * Accept some new gTLD e-Mail addressesRainer Rillke2014-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_85Andreas Gohr2014-10-27
| |\ \ | | | | | | | | Translation update (zh-tw)
| | * | translation updatelioujheyu2014-10-27
| | | |
| * | | Merge pull request #913 from dokuwiki-translate/lang_update_86Andreas Gohr2014-10-27
| |\ \ \ | | |/ / | |/| | Translation update (de)
| | * | translation updatePascal Schröder2014-10-27
| |/ /
| * | Merge pull request #910 from dokuwiki-translate/lang_update_77Andreas Gohr2014-10-25
| |\ \ | | | | | | | | Translation update (cs)
| | * | translation updateJaroslav Lichtblau2014-10-22
| |/ /
| * | Merge pull request #909 from splitbrain/visibilityDokuCssFileAndreas Gohr2014-10-22
| |\ \ | | | | | | | | visibility from private to protected for DokuCssFile
| | * | visibility from private to protected for DokuCssFileGerrit Uitslag2014-10-22
| |/ /
| * | use phpdocs deprecated notationGerrit Uitslag2014-10-21
| | |
| * | Merge pull request #908 from dokuwiki-translate/lang_update_73Andreas Gohr2014-10-20
| |\ \ | | | | | | | | Translation update (ru)
| | * | translation updateAleksandr Selivanov2014-10-18
| |/ /
| * | -k requires parameter. fixes #902Andreas Gohr2014-10-17
| | |
| * | Merge pull request #903 from LarsGit223/masterAndreas Gohr2014-10-17
| |\ \ | | |/ | |/| Fixed unrecognized regular expressions behind '&&' or '||' operators in JavaScript compression. Finally fixes #897.
| | * Ooops...forgot to commit test cases for #897.LarsDW2232014-10-15
| | |
| | * Fixed JavaScript compression. The compressor did not recognize a regular ↵LarsDW2232014-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_70Andreas Gohr2014-10-16
| |\ \ | | | | | | | | Translation update (eu)
| | * | translation updateYadav Gowda2014-10-15
| |/ /
| * | new PHP minimum requirement is now 5.3.3Andreas Gohr2014-10-14
| | | | | | | | | | | | that's the version in Debian old stable
| * | Merge pull request #880 from Dr-Yukon/patch-3Andreas Gohr2014-10-14
| |\ \ | | | | | | | | Update index.php