summaryrefslogtreecommitdiff
path: root/lib/plugins
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stableGuy Brand2013-11-18
|\
| * Merge branch 'lang_update_466' of github.com:dokuwiki-translate/dokuwiki ↵Anika Henke2013-11-16
| |\ | | | | | | | | | | | | | | | | | | into lang_update_466 Conflicts: lib/plugins/authmysql/lang/da/settings.php
| | * translation updatesoer96482013-11-12
| | |
| * | Merge remote-tracking branch 'origin/master' into lang_update_464Anika Henke2013-11-16
| |\ \
| | * \ Merge pull request #426 from araname/masterAnika Henke2013-11-16
| | |\ \ | | | | | | | | | | fix mistranslated messages (ko)
| | | * | fix mistranslated messagesMyeongjin2013-11-16
| | | | |
| | * | | translation updateMyeongjin2013-11-16
| | |/ /
| * | | Merge branch 'lang_update_464' of github.com:dokuwiki-translate/dokuwiki ↵Anika Henke2013-11-16
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into lang_update_464 Conflicts: lib/plugins/authad/lang/de/settings.php lib/plugins/usermanager/lang/de/lang.php
| | * | translation updateJonas Gröger2013-11-12
| | |/
| * | remove 'infos' misspellingElan Ruusamäe2013-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_474Andreas Gohr2013-11-13
| |\ \ | | | | | | | | Translation update (sk)
| | * | translation updateMartin Michalek2013-11-12
| | |/
| * | Merge pull request #416 from dokuwiki-translate/lang_update_465Andreas Gohr2013-11-13
| |\ \ | | | | | | | | Translation update (da)
| | * | translation updatesoer96482013-11-12
| | |/
| * | Merge pull request #414 from dokuwiki-translate/lang_update_463Andreas Gohr2013-11-13
| |\ \ | | | | | | | | Translation update (ko)
| | * | translation updateMyeongjin2013-11-12
| | |/
| * | Merge pull request #412 from dokuwiki-translate/lang_update_461Andreas Gohr2013-11-13
| |\ \ | | | | | | | | Translation update (ru)
| | * | translation updateArtur2013-11-12
| | |/
| * / translation updateBen Fey2013-11-12
| |/
| * Update zh-tw translationDanny Lin2013-11-11
| |
| * Fix password decryption during LDAP rebindingMichael Hamann2013-11-08
| | | | | | | | | | The LDAP rebinding was still using the old blowfish encryption instead of AES so rebinding failed.
| * translation updateRobert Bogenschneider2013-10-29
| |
| * translation updateAhmad Abd-Elghany2013-10-28
| |
* | Merge branch 'master' into stableAndreas Gohr2013-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 pluginAndreas Gohr2013-10-28
| |
| * Merge pull request #395 from splitbrain/FS#2867Andreas Gohr2013-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 aclsChristopher Smith2013-10-21
| | |
| * | Fix issues from teams:i18n:translation-check in localizationsGerrit Uitslag2013-10-27
| | |
| * | translation updateRemon2013-10-25
| | |
| * | allow charset for SSO to be configured FS#2148Andreas Gohr2013-10-22
| | |
| * | Merge pull request #398 from dokuwiki-translate/lang_update_412Andreas Gohr2013-10-22
| |\ \ | | | | | | | | Translation update (zh)
| | * | translation updatelainme2013-10-22
| | |/
| * / translation updateMustafa Aslan2013-10-22
| |/
| * Merge pull request #394 from dokuwiki-translate/lang_update_406Andreas Gohr2013-10-21
| |\ | | | | | | Translation update (da)
| | * translation updateJens Hyllegaard2013-10-21
| | |
| * | Merge pull request #393 from dokuwiki-translate/lang_update_405Andreas Gohr2013-10-21
| |\ \ | | | | | | | | Translation update (da)
| | * | translation updateJens Hyllegaard2013-10-21
| | |/
| * | Merge pull request #392 from dokuwiki-translate/lang_update_404Andreas Gohr2013-10-21
| |\ \ | | | | | | | | Translation update (he)
| | * | translation updateRoy Zahor2013-10-21
| | |/
| * / translation updateJens Hyllegaard2013-10-21
| |/
| * Merge pull request #378 from splitbrain/aclajaxAndreas Gohr2013-10-20
| |\ | | | | | | acl plugin: move ajax.php to action.php
| | * remove obsolete opera handling and session closingAndreas Gohr2013-10-20
| | |
| | * remove no longer used ajax.phpAndreas Gohr2013-10-20
| | |
| | * acl ajax: add messages to returnsGerrit Uitslag2013-10-14
| | |
| | * acl ajax: replace die() by returnGerrit Uitslag2013-10-14
| | |
| | * Code reformatting and remove unused global confGerrit Uitslag2013-10-14
| | |
| | * remove unused variableGerrit Uitslag2013-10-14
| | |
| | * move ajax.php to action.php. Fixes FS#2233Gerrit Uitslag2013-10-14
| | |
| * | Merge pull request #380 from splitbrain/phpstrictAndreas Gohr2013-10-20
| |\ \ | | | | | | | | Php strict
| | * | Info plugin: allow xhtml renders to not to be an xhtml rendererMichael Hamann2013-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.