Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into stable | Andreas Gohr | 2013-10-28 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (413 commits) release preparation fixed strict violation in ACL plugin Fix issues from teams:i18n:translation-check in localizations ensure locale is set back to the original value skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale unittests for auth_loadACL translation update allow charset for SSO to be configured FS#2148 Mailer: avoid overlong headers in content ids FS#2868 translation update translation update replace \s, \S with [ \t], [^ \t] in regexs used with acls translation update translation update translation update translation update Fix handling of the legacy subscription action name remove obsolete opera handling and session closing remove no longer used ajax.php fix proxy CONNECT where HTTP 1.1 answer is given ... | ||
| * | Fix issues from teams:i18n:translation-check in localizations | Gerrit Uitslag | 2013-10-27 |
| | | |||
| * | translation update | Remon | 2013-10-25 |
| | | |||
| * | translation update | lainme | 2013-10-22 |
| | | |||
| * | translation update | Jens Hyllegaard | 2013-10-21 |
| | | |||
| * | Merge pull request #345 from splitbrain/ldapgroupmapping | Andreas Gohr | 2013-10-15 |
| |\ | | | | | | | skips 'count' entries in ldap results. Fixes FS#2370 | ||
| | * | skips 'count' entries in ldap results. Fixes FS#2370 | Gerrit Uitslag | 2013-09-20 |
| | | | |||
| * | | translation update | Martin Michalek | 2013-10-14 |
| | | | |||
| * | | Merge pull request #374 from dokuwiki-translate/lang_update_387 | Andreas Gohr | 2013-10-10 |
| |\ \ | | | | | | | | | Translation update (sk) | ||
| | * | | translation update | Martin Michalek | 2013-10-10 |
| | | | | |||
| * | | | translation update | Hideaki SAWADA | 2013-10-08 |
| |/ / | |||
| * | | translation update | Serenity87HUN | 2013-10-07 |
| | | | |||
| * | | Merge pull request #360 from dokuwiki-translate/lang_update_360 | Gerrit Uitslag | 2013-10-06 |
| |\ \ | | | | | | | | | Translation update (ja) | ||
| | * | | translation update | Hideaki SAWADA | 2013-10-04 |
| | |/ | |||
| * / | translation update | Martin Michalek | 2013-10-01 |
| |/ | |||
| * | translation update | schplurtz | 2013-09-16 |
| | | |||
| * | translation update | schplurtz | 2013-09-15 |
| | | |||
| * | Merge pull request #304 from dokuwiki-translate/lang_update_234 | Andreas Gohr | 2013-08-21 |
| |\ | | | | | | | Translation update (de-informal) | ||
| | * | translation update | Dennis Plöger | 2013-08-19 |
| | | | |||
| * | | translation update | Aleksandr Selivanov | 2013-08-20 |
| | | | |||
| * | | translation update | Myeongjin | 2013-08-19 |
| |/ | |||
| * | Merge pull request #297 from dokuwiki-translate/lang_update_199 | Andreas Gohr | 2013-08-16 |
| |\ | | | | | | | Translation update (cs) | ||
| | * | translation update | Zbyněk Křivka | 2013-08-15 |
| | | | |||
| * | | translation update | André Neves | 2013-08-16 |
| |/ | |||
| * | translation update | Felipe Castro | 2013-08-15 |
| | | |||
| * | translation update | Frederico Gonçalves Guimarães | 2013-08-15 |
| | | |||
| * | translation update | christian studer | 2013-08-15 |
| | | |||
| * | translation update | Myeongjin | 2013-08-12 |
| | | |||
| * | improved bundled plugin descriptions | Andreas Gohr | 2013-08-11 |
| | | |||
| * | translation update | Gerrit Uitslag | 2013-08-10 |
| | | |||
| * | translation update | Emmanuel | 2013-08-08 |
| | | |||
| * | translation update | Edmondo Di Tucci | 2013-08-08 |
| | | |||
| * | translation update | Rachel | 2013-08-06 |
| | | |||
| * | translation update | tsangho | 2013-08-05 |
| | | |||
| * | translation update | Tor Härnqvist | 2013-08-04 |
| | | |||
| * | translation update | Sven | 2013-08-04 |
| | | |||
| * | Merge pull request #264 from splitbrain/authconfigdanger | Andreas Gohr | 2013-08-04 |
| |\ | | | | | | | Authconfigdanger | ||
| | * | change 'debug' setting to 'security' (rather than 'danger') | Christopher Smith | 2013-08-03 |
| | | | |||
| | * | add 'danger' alert to authldap config settings | Christopher Smith | 2013-08-03 |
| | | | |||
| * | | translation update | mprins | 2013-08-04 |
| |/ | |||
| * | Merge pull request #186 from splitbrain/configmgr_improvements | Andreas Gohr | 2013-08-03 |
| |\ | | | | | | | Configmgr improvements | ||
| | * | Merge branch 'master' into configmgr_improvements | Christopher Smith | 2013-08-03 |
| | |\ | |||
| | * \ | Merge branch 'master' into configmgr_improvements | Christopher Smith | 2013-07-30 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/auth.php inc/template.php lib/plugins/authad/lang/zh/settings.php lib/plugins/authldap/lang/en/settings.php lib/plugins/authldap/lang/zh/settings.php lib/plugins/authmysql/lang/zh/settings.php lib/plugins/config/settings/config.class.php lib/plugins/usermanager/admin.php | ||
| | * | | | fixed typos | Andreas Gohr | 2013-02-24 |
| | | | | | |||
| | * | | | Simplified Chinese language update | lainme | 2013-02-24 |
| | | | | | |||
| | * | | | Italian language update | Lorenzo Radaelli | 2013-02-24 |
| | | | | | |||
| * | | | | translation update | Henrik | 2013-08-03 |
| | |_|/ | |/| | | |||
| * | | | Revert "translation update" | Andreas Gohr | 2013-08-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d6d855093f24c6c3f608d005189385959a7efbf7. I guess it was a bit too early to think straight :-/ | ||
| * | | | translation update | DokuWiki Translation | 2013-08-02 |
| | | | | |||
| * | | | Brazilian Portuguese language update | Frederico Guimarães | 2013-08-01 |
| | |/ | |/| |