Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into stable | Guy Brand | 2013-11-18 |
|\ | |||
| * | Merge branch 'lang_update_466' of github.com:dokuwiki-translate/dokuwiki ↵ | Anika Henke | 2013-11-16 |
| |\ | | | | | | | | | | | | | | | | | | | into lang_update_466 Conflicts: lib/plugins/authmysql/lang/da/settings.php | ||
| | * | translation update | soer9648 | 2013-11-12 |
| | | | |||
| * | | Merge remote-tracking branch 'origin/master' into lang_update_464 | Anika Henke | 2013-11-16 |
| |\ \ | |||
| | * \ | Merge pull request #426 from araname/master | Anika Henke | 2013-11-16 |
| | |\ \ | | | | | | | | | | | fix mistranslated messages (ko) | ||
| | | * | | fix mistranslated messages | Myeongjin | 2013-11-16 |
| | | | | | |||
| | * | | | translation update | Myeongjin | 2013-11-16 |
| | |/ / | |||
| * | | | Merge branch 'lang_update_464' of github.com:dokuwiki-translate/dokuwiki ↵ | Anika Henke | 2013-11-16 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into lang_update_464 Conflicts: lib/plugins/authad/lang/de/settings.php lib/plugins/usermanager/lang/de/lang.php | ||
| | * | | translation update | Jonas Gröger | 2013-11-12 |
| | |/ | |||
| * | | remove 'infos' misspelling | Elan Ruusamäe | 2013-11-13 |
| | | | | | | | | | | | | http://english.stackexchange.com/questions/117552/why-does-information-not-have-a-plural-form | ||
| * | | Merge pull request #418 from dokuwiki-translate/lang_update_474 | Andreas Gohr | 2013-11-13 |
| |\ \ | | | | | | | | | Translation update (sk) | ||
| | * | | translation update | Martin Michalek | 2013-11-12 |
| | |/ | |||
| * | | Merge pull request #416 from dokuwiki-translate/lang_update_465 | Andreas Gohr | 2013-11-13 |
| |\ \ | | | | | | | | | Translation update (da) | ||
| | * | | translation update | soer9648 | 2013-11-12 |
| | |/ | |||
| * | | Merge pull request #414 from dokuwiki-translate/lang_update_463 | Andreas Gohr | 2013-11-13 |
| |\ \ | | | | | | | | | Translation update (ko) | ||
| | * | | translation update | Myeongjin | 2013-11-12 |
| | |/ | |||
| * | | Merge pull request #412 from dokuwiki-translate/lang_update_461 | Andreas Gohr | 2013-11-13 |
| |\ \ | | | | | | | | | Translation update (ru) | ||
| | * | | translation update | Artur | 2013-11-12 |
| | |/ | |||
| * / | translation update | Ben Fey | 2013-11-12 |
| |/ | |||
| * | Update zh-tw translation | Danny Lin | 2013-11-11 |
| | | |||
| * | Fix password decryption during LDAP rebinding | Michael Hamann | 2013-11-08 |
| | | | | | | | | | | The LDAP rebinding was still using the old blowfish encryption instead of AES so rebinding failed. | ||
| * | translation update | Robert Bogenschneider | 2013-10-29 |
| | | |||
| * | translation update | Ahmad Abd-Elghany | 2013-10-28 |
| | | |||
* | | 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 ... | ||
| * | fixed strict violation in ACL plugin | Andreas Gohr | 2013-10-28 |
| | | |||
| * | Merge pull request #395 from splitbrain/FS#2867 | Andreas Gohr | 2013-10-28 |
| |\ | | | | | | | FS#2867, ACL processing may fail with utf-8 characters which include byte 'A0'. | ||
| | * | replace \s, \S with [ \t], [^ \t] in regexs used with acls | Christopher Smith | 2013-10-21 |
| | | | |||
| * | | Fix issues from teams:i18n:translation-check in localizations | Gerrit Uitslag | 2013-10-27 |
| | | | |||
| * | | translation update | Remon | 2013-10-25 |
| | | | |||
| * | | allow charset for SSO to be configured FS#2148 | Andreas Gohr | 2013-10-22 |
| | | | |||
| * | | Merge pull request #398 from dokuwiki-translate/lang_update_412 | Andreas Gohr | 2013-10-22 |
| |\ \ | | | | | | | | | Translation update (zh) | ||
| | * | | translation update | lainme | 2013-10-22 |
| | |/ | |||
| * / | translation update | Mustafa Aslan | 2013-10-22 |
| |/ | |||
| * | Merge pull request #394 from dokuwiki-translate/lang_update_406 | Andreas Gohr | 2013-10-21 |
| |\ | | | | | | | Translation update (da) | ||
| | * | translation update | Jens Hyllegaard | 2013-10-21 |
| | | | |||
| * | | Merge pull request #393 from dokuwiki-translate/lang_update_405 | Andreas Gohr | 2013-10-21 |
| |\ \ | | | | | | | | | Translation update (da) | ||
| | * | | translation update | Jens Hyllegaard | 2013-10-21 |
| | |/ | |||
| * | | Merge pull request #392 from dokuwiki-translate/lang_update_404 | Andreas Gohr | 2013-10-21 |
| |\ \ | | | | | | | | | Translation update (he) | ||
| | * | | translation update | Roy Zahor | 2013-10-21 |
| | |/ | |||
| * / | translation update | Jens Hyllegaard | 2013-10-21 |
| |/ | |||
| * | Merge pull request #378 from splitbrain/aclajax | Andreas Gohr | 2013-10-20 |
| |\ | | | | | | | acl plugin: move ajax.php to action.php | ||
| | * | remove obsolete opera handling and session closing | Andreas Gohr | 2013-10-20 |
| | | | |||
| | * | remove no longer used ajax.php | Andreas Gohr | 2013-10-20 |
| | | | |||
| | * | acl ajax: add messages to returns | Gerrit Uitslag | 2013-10-14 |
| | | | |||
| | * | acl ajax: replace die() by return | Gerrit Uitslag | 2013-10-14 |
| | | | |||
| | * | Code reformatting and remove unused global conf | Gerrit Uitslag | 2013-10-14 |
| | | | |||
| | * | remove unused variable | Gerrit Uitslag | 2013-10-14 |
| | | | |||
| | * | move ajax.php to action.php. Fixes FS#2233 | Gerrit Uitslag | 2013-10-14 |
| | | | |||
| * | | Merge pull request #380 from splitbrain/phpstrict | Andreas Gohr | 2013-10-20 |
| |\ \ | | | | | | | | | Php strict | ||
| | * | | Info plugin: allow xhtml renders to not to be an xhtml renderer | Michael Hamann | 2013-10-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Renderers that set the format to xhtml don't necessarily inherit from Doku_Renderer_xhtml, this reverts a prior change that introduced the stricter parameter type. |