summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into extension_managerAndreas Gohr2013-08-11
|\
| * improved bundled plugin descriptionsAndreas Gohr2013-08-11
* | Merge branch 'master' into extension_managerAndreas Gohr2013-08-11
|\|
| * Merge pull request #282 from dokuwiki-translate/lang_update_111Andreas Gohr2013-08-11
| |\
| | * translation updateGerrit Uitslag2013-08-10
| * | Merge pull request #283 from dokuwiki-translate/lang_update_112Andreas Gohr2013-08-11
| |\ \ | | |/ | |/|
| | * translation updater0sk2013-08-11
| |/
| * Merge pull request #280 from dokuwiki-translate/lang_update_99Andreas Gohr2013-08-09
| |\
| | * translation updateEmmanuel2013-08-08
| * | Merge pull request #281 from dokuwiki-translate/lang_update_100Andreas Gohr2013-08-09
| |\ \ | | |/ | |/|
| | * translation updateEgor Smkv2013-08-08
| |/
| * Merge pull request #278 from dokuwiki-translate/lang_update_89Andreas Gohr2013-08-08
| |\
| | * translation updateEdmondo Di Tucci2013-08-08
| |/
| * changed style of `<file>` slightly to help tell it apart from `<code>`Anika Henke2013-08-06
| * Merge pull request #276 from dokuwiki-translate/lang_update_54Andreas Gohr2013-08-06
| |\
| | * translation updateRachel2013-08-06
| |/
| * Merge pull request #275 from dokuwiki-translate/lang_update_50Andreas Gohr2013-08-05
| |\
| | * translation updateEdmondo Di Tucci2013-08-05
| |/
| * Merge pull request #274 from dokuwiki-translate/lang_update_48Andreas Gohr2013-08-05
| |\
| | * translation updatetsangho2013-08-05
| |/
| * Merge pull request #271 from dokuwiki-translate/lang_update_40Andreas Gohr2013-08-05
| |\
| | * translation updateConstantinos Xanthopoulos2013-08-04
| * | Merge pull request #273 from dokuwiki-translate/lang_update_47Dominik Eckelmann2013-08-05
| |\ \
| | * | translation updatePavel2013-08-05
| | |/
| * | Merge pull request #272 from dokuwiki-translate/lang_update_44Dominik Eckelmann2013-08-04
| |\ \ | | |/ | |/|
| | * translation updateTor Härnqvist2013-08-04
| |/
| * Merge pull request #270 from dokuwiki-translate/lang_update_35Dominik Eckelmann2013-08-04
| |\
| | * translation updateSven2013-08-04
| |/
| * removed now unused interwiki iconsAndreas Gohr2013-08-04
| * removed old, possibly never used interwiki definitionsAndreas Gohr2013-08-04
| * Merge pull request #237 from splitbrain/changelogtestsonlyAndreas Gohr2013-08-04
| |\
| | * Merge remote-tracking branch 'origin/master' into changelogtestsonlyKlap-in2013-08-03
| | |\
| | * | for negative or zero number of revs to return return empty array by getRevisionsKlap-in2013-08-03
| | * | Merge remote-tracking branch 'origin/master' into changelogtestsonlyKlap-in2013-08-03
| | |\ \
| | * | | Fixed file names of test classesKlap-in2013-07-20
| | * | | Added tests for getRevisions and getRevisionInfo from page changelogKlap-in2013-07-20
| * | | | Merge pull request #263 from splitbrain/mediamanager_list_orderingAndreas Gohr2013-08-04
| |\ \ \ \
| | * | | | show media files in date order (most recent first) after an upload is completedChristopher Smith2013-08-03
| | * | | | fix the default ordering of media files to be "natural".Christopher Smith2013-08-03
| | * | | | move the media search formlet upChristopher Smith2013-08-03
| | | |_|/ | | |/| |
| * | | | Merge pull request #264 from splitbrain/authconfigdangerAndreas Gohr2013-08-04
| |\ \ \ \
| | * | | | change 'debug' setting to 'security' (rather than 'danger')Christopher Smith2013-08-03
| | * | | | add 'danger' alert to authpgsql config settingsChristopher Smith2013-08-03
| | * | | | add 'danger' alert to authmysql config settingsChristopher Smith2013-08-03
| | * | | | add 'danger' alert to authldap config settingsChristopher Smith2013-08-03
| | * | | | add 'danger' alert to authad config settingsChristopher Smith2013-08-03
| | |/ / /
| * | | | Merge pull request #254 from splitbrain/user_importexportAndreas Gohr2013-08-04
| |\ \ \ \
| | * | | | convert from iso-8859-1 if not utf8Christopher Smith2013-08-03
| | * | | | style improvementsChristopher Smith2013-08-02
| | * | | | enable email notifications & alert messages for imported usersChristopher Smith2013-08-02