summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #429 from dokuwiki-translate/lang_update_492Andreas Gohr2013-11-17
|\ | | | | Translation update (ko)
| * translation updateMyeongjin2013-11-17
| |
* | 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
| | | |
| * | | Merge pull request #425 from dokuwiki-translate/lang_update_487Anika Henke2013-11-16
| |\ \ \ | | | | | | | | | | Translation update (ko)
| | * | | translation updateMyeongjin2013-11-16
| | |/ /
| * | | Merge pull request #424 from dokuwiki-translate/lang_update_485Anika Henke2013-11-16
| |\ \ \ | | |/ / | |/| | Translation update (sk)
| | * | translation updateMartin Michalek2013-11-14
| | |/
* | | 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
| |/
* | Merge pull request #422 from glensc/patch-1Andreas Gohr2013-11-13
|\ \ | | | | | | media_isexternal do not capture
| * | media_isexternal do not captureElan Ruusamäe2013-11-13
| | | | | | | | | do not capture groups in media_isexternal. saves perhaps some cpu cycles and some bytes memory
* | | Merge pull request #423 from glensc/no-infosAndreas Gohr2013-11-13
|\ \ \ | |/ / |/| | remove 'infos' misspelling
| * | remove 'infos' misspellingElan Ruusamäe2013-11-13
|/ / | | | | | | http://english.stackexchange.com/questions/117552/why-does-information-not-have-a-plural-form
* | Merge pull request #420 from dokuwiki-translate/lang_update_483Andreas Gohr2013-11-13
|\ \ | | | | | | Translation update (sk)
| * | translation updateMartin Michalek2013-11-12
| |/
* | 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 #413 from dokuwiki-translate/lang_update_462Andreas Gohr2013-11-13
|\ \ | | | | | | Translation update (he)
| * | translation updatealex2013-11-12
| |/
* | Merge pull request #412 from dokuwiki-translate/lang_update_461Andreas Gohr2013-11-13
|\ \ | | | | | | Translation update (ru)
| * | translation updateArtur2013-11-12
| |/
* | Merge pull request #411 from dokuwiki-translate/lang_update_458Andreas Gohr2013-11-13
|\ \ | |/ |/| Translation update (de)
| * translation updateBen Fey2013-11-12
|/
* updated inline documentation about location of local style.iniAnika Henke2013-11-11
|
* Merge pull request #409 from danny0838/masterAndreas Gohr2013-11-11
|\ | | | | Update zh-tw translation
| * 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.
* Revert "Fixes validation problems with base64 encoded images in CSS."Anika Henke2013-11-03
| | | | | This reverts commit 88833bac87e7fb295c0479a8260d1d63051bca8d. and fixes FS#2874
* Merge pull request #405 from splitbrain/FS#2409localizetemplatephpAndreas Gohr2013-11-01
|\ | | | | Localize some meta header titels. Fixes FS#2409
| * localize some meta header titels. Fixes FS#2409Gerrit Uitslag2013-10-31
|/
* compatibility functions for missing ctype extension FS#2873Andreas Gohr2013-10-30
|
* Fix the media usage index to include local linksMichael Hamann2013-10-29
|
* release preparationAndreas Gohr2013-10-29
|
* Merge pull request #404 from dokuwiki-translate/lang_update_435Andreas Gohr2013-10-29
|\ | | | | Translation update (eo)
| * translation updateRobert Bogenschneider2013-10-29
|/
* Merge pull request #402 from dokuwiki-translate/lang_update_425Andreas Gohr2013-10-29
|\ | | | | Translation update (ar)
| * translation updateAhmad Abd-Elghany2013-10-28
|/
* 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'.
| * ensure locale is set back to the original valueChristopher Smith2013-10-25
| |
| * skip FS#2867 test if \s doesn't match \xA0 after attempting to change the localeChristopher Smith2013-10-25
| |
| * unittests for auth_loadACLChristopher Smith2013-10-25
| |