summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* authplain: Escape ':' in any data field as '\:'Angus Gratton2014-07-01
| | | | | | | | | | | | ':' is the field delimiter in the authplain flat text conf/users.auth.php file, but it's also used as an internal delimiter for the 'mediawiki' password hash format. Currently using this hash format corrupts the file This change escapes ':' as '\:' in any field in the users.auth.php file, and any '\' as '\\'. Also adds test cases for escaping modes.
* Merge pull request #775 from dokuwiki-translate/lang_update_63Andreas Gohr2014-06-30
|\ | | | | Translation update (pt-br)
| * translation updateEdnei2014-06-30
|/
* icreased message versionAndreas Gohr2014-06-25
|
* Merge pull request #766 from splitbrain/media_acl_fixAndreas Gohr2014-06-25
|\ | | | | Quick fix for #765 - ACL checks in the media manager ajax calls
| * Quick fix for #765 - ACL checks in the media manager ajax callsMichael Hamann2014-06-25
|/ | | | This should be superseded by a proper rewrite of the media manager code
* fixed template color replacement previewAndreas Gohr2014-06-22
|
* allow config presets with installerAndreas Gohr2014-06-22
| | | | | | | | | | | | | this adds the ability to place a install.conf file next to the install.php which contains additional config options to be written to conf/local.php on completion of the installer. The install.conf is automatically deleted then. This is useful for automated DokuWiki installers or downloaders that take care of downloading DokuWiki and then drop the user in the default install dialog for initial setup. These tools may set up host specific things options like rewrites, image magic path or file permission settings in this preset.
* fix IE upload when Array prototype has been modifiedAndreas Gohr2014-06-19
| | | | | | The edittable plugin broke uploading in IE8 (and maybe others) because the Handsontable script adds a function to the Array prototype and the uploading script did not properly check that.
* Replace two non-free icons by free alternativesTanguy Ortolo2014-06-15
|
* Merge pull request #756 from dokuwiki-translate/lang_update_36Andreas Gohr2014-06-15
|\ | | | | Translation update (lv)
| * translation updateAivars Miška2014-06-10
| |
* | Merge pull request #757 from dokuwiki-translate/lang_update_39Andreas Gohr2014-06-15
|\ \ | | | | | | Translation update (fr)
| * | translation updateYoBoY2014-06-10
| |/
* | Merge pull request #758 from dokuwiki-translate/lang_update_46Andreas Gohr2014-06-15
|\ \ | | | | | | Translation update (hu)
| * | translation updateMátyás Jani2014-06-12
| |/
* | Merge pull request #719 from splitbrain/trailingcolonsAndreas Gohr2014-06-15
|\ \ | |/ |/| Move trailing colons to the language strings
| * Merge remote-tracking branch 'origin/master' into trailingcolonsGerrit Uitslag2014-06-05
| |\ | |/ |/|
* | Merge pull request #750 from dokuwiki-translate/lang_update_27Gerrit Uitslag2014-06-05
|\ \ | | | | | | Translation update (tr)
| * | translation updateİlker R. Kapaç2014-05-31
| | |
| | * Merge remote-tracking branch 'origin/master' into trailingcolonsGerrit Uitslag2014-06-03
| | |\ | |_|/ |/| | | | | | | | | | | Conflicts: inc/lang/lv/lang.php inc/lang/pt/lang.php
* | | Merge pull request #751 from dokuwiki-translate/lang_update_31Anika Henke2014-06-01
|\ \ \ | | | | | | | | Translation update (ko)
| * | | translation updateMyeongjin2014-06-01
| |/ /
* | | Merge pull request #749 from dokuwiki-translate/lang_update_26Anika Henke2014-06-01
|\ \ \ | | | | | | | | Translation update (pt)
| * | | translation updatePaulo Silva2014-05-30
| |/ /
* | | Merge pull request #748 from dokuwiki-translate/lang_update_25Anika Henke2014-06-01
|\ \ \ | |/ / |/| | Translation update (lv)
| * | translation updateAivars Miška2014-05-30
|/ /
* | Merge pull request #747 from dokuwiki-translate/lang_update_24Andreas Gohr2014-05-29
|\ \ | | | | | | Translation update (pt)
| * | translation updateMurilo2014-05-29
|/ /
* | Merge pull request #746 from dokuwiki-translate/lang_update_23Andreas Gohr2014-05-29
|\ \ | | | | | | Translation update (es)
| * | translation updateAntonio Castilla2014-05-29
|/ /
* | Merge pull request #744 from dokuwiki-translate/lang_update_20Andreas Gohr2014-05-29
|\ \ | | | | | | Translation update (es)
| * | translation updateAntonio Castilla2014-05-29
|/ /
| * Merge remote-tracking branch 'origin/master' into trailingcolonsGerrit Uitslag2014-05-26
| |\ | |/ |/| | | | | | | Conflicts: inc/lang/cs/lang.php inc/lang/hu/lang.php
* | made $capture public in metadata rendererAndreas Gohr2014-05-26
| | | | | | | | some plugins (eg. the tag plugin) rely on it
* | Merge pull request #739 from dokuwiki-translate/lang_update_3Andreas Gohr2014-05-26
|\ \ | | | | | | Translation update (fr)
| * | translation updateSchplurtz le Déboulonné2014-05-26
| | |
* | | Merge pull request #738 from dokuwiki-translate/lang_update_2Andreas Gohr2014-05-26
|\ \ \ | |/ / |/| | Translation update (fr)
| * | translation updateSchplurtz le Déboulonné2014-05-26
|/ /
* | just some more doc blocksAndreas Gohr2014-05-25
| |
* | removed some unused lines in HTTPClientAndreas Gohr2014-05-25
| |
* | Merge pull request #626 from splitbrain/feedmodelistsortAndreas Gohr2014-05-25
|\ \ | | | | | | Added sort by date option to feed in list mode
| * | add date sort option for list mode of feedGerrit Uitslag2014-03-20
| | |
| * | Improve encoding dir in rssListNamespace()Gerrit Uitslag2014-03-20
| | |
* | | Merge pull request #729 from splitbrain/scrutinizerAndreas Gohr2014-05-25
|\ \ \ | | | | | | | | PHPdocs, unused var, etc
| * | | revert return of getNS to false againAndreas Gohr2014-05-25
| | | |
| * | | change getNS output check to empty string as wellGerrit Uitslag2014-05-21
| | | |
| * | | PHPdocs pageutilsGerrit Uitslag2014-05-21
| | | |
| * | | getNS returns empty string instead of falseGerrit Uitslag2014-05-21
| | | |
| * | | PHPdocs changelogGerrit Uitslag2014-05-21
| | | |