Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | swapped logic for allowing/disabling registration in installer | Anika Henke | 2013-11-17 |
| | |||
* | Merge pull request #408 from splitbrain/approve-users-acl-policy | Anika Henke | 2013-11-17 |
|\ | | | | | Add possibility to approve users in installer's ACL policy | ||
| * | changed user approval option to disable registration option in installer | Anika Henke | 2013-11-17 |
| | | |||
| * | removed redundant line | Anika Henke | 2013-11-10 |
| | | |||
| * | changed how to approve users in installer ACL policy | Anika Henke | 2013-11-09 |
| | | |||
| * | added possibility to approve users to ACL policies in installer | Anika Henke | 2013-11-09 |
| | | |||
* | | Merge pull request #427 from splitbrain/improve_template_event | Anika Henke | 2013-11-17 |
|\ \ | | | | | | | Improved pagetools event in dokuwiki template | ||
| * | | removed tpl from TEMPLATE_PAGETOOLS_DISPLAY event as it's always available in | Anika Henke | 2013-11-17 |
| | | | |||
| * | | Improved pagetools event in dokuwiki template | Anika Henke | 2013-11-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the template name away from the hook name into the event data (as the 'tpl' value). Therefore it moves the previous data items into the 'items' sub array. A 'view' value has also been added to describe in which template file the event was called ('main' or 'detail'). This way it will be much easier for plugins to consider default cases and differentiate between main and other layouts. | ||
* | | | Merge pull request #421 from splitbrain/FS#2879 | Christopher Smith | 2013-11-17 |
|\ \ \ | | | | | | | | | FS#2879, relative url() values in style.ini replacements not being adjusted | ||
| * | | | Fix an issue with style.ini replacements values not having relative | Christopher Smith | 2013-11-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locations corrected, when those values are "url(...)". Explanation: In the change to the less css extension, variable replacements now happen after the less/css files are processed for correction of relative locations. | ||
* | | | | Merge pull request #428 from dokuwiki-translate/lang_update_489 | Andreas Gohr | 2013-11-17 |
|\ \ \ \ | | | | | | | | | | | Translation update (eo) | ||
| * | | | | translation update | Robert Bogenschneider | 2013-11-17 |
| | | | | | |||
* | | | | | Merge pull request #429 from dokuwiki-translate/lang_update_492 | Andreas Gohr | 2013-11-17 |
|\ \ \ \ \ | | | | | | | | | | | | | Translation update (ko) | ||
| * | | | | | translation update | Myeongjin | 2013-11-17 |
| |/ / / / | |||
* | | | | | 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 |
| | | |/ / | | |/| | | |||
| * | | | | Merge pull request #425 from dokuwiki-translate/lang_update_487 | Anika Henke | 2013-11-16 |
| |\ \ \ \ | | | | | | | | | | | | | Translation update (ko) | ||
| | * | | | | translation update | Myeongjin | 2013-11-16 |
| | |/ / / | |||
| * | | | | Merge pull request #424 from dokuwiki-translate/lang_update_485 | Anika Henke | 2013-11-16 |
| |\ \ \ \ | | |/ / / | |/| | | | Translation update (sk) | ||
| | * | | | translation update | Martin Michalek | 2013-11-14 |
| | |/ / | |||
* | | | | 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 |
| |/ / | |||
* | | | Merge pull request #422 from glensc/patch-1 | Andreas Gohr | 2013-11-13 |
|\ \ \ | | | | | | | | | media_isexternal do not capture | ||
| * | | | media_isexternal do not capture | Elan Ruusamäe | 2013-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-infos | Andreas Gohr | 2013-11-13 |
|\ \ \ \ | |/ / / |/| | | | remove 'infos' misspelling | ||
| * | | | 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 #420 from dokuwiki-translate/lang_update_483 | Andreas Gohr | 2013-11-13 |
|\ \ \ | | | | | | | | | Translation update (sk) | ||
| * | | | translation update | Martin Michalek | 2013-11-12 |
| |/ / | |||
* | | | 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 #413 from dokuwiki-translate/lang_update_462 | Andreas Gohr | 2013-11-13 |
|\ \ \ | | | | | | | | | Translation update (he) | ||
| * | | | translation update | alex | 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 |
| |/ / | |||
* | | | Merge pull request #411 from dokuwiki-translate/lang_update_458 | Andreas Gohr | 2013-11-13 |
|\ \ \ | |/ / |/| | | Translation update (de) | ||
| * | | translation update | Ben Fey | 2013-11-12 |
|/ / | |||
* | | updated inline documentation about location of local style.ini | Anika Henke | 2013-11-11 |
| | | |||
* | | Merge pull request #409 from danny0838/master | Andreas Gohr | 2013-11-11 |
|\ \ | |/ |/| | Update zh-tw translation | ||
| * | 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. | ||
* | Revert "Fixes validation problems with base64 encoded images in CSS." | Anika Henke | 2013-11-03 |
| | | | | | This reverts commit 88833bac87e7fb295c0479a8260d1d63051bca8d. and fixes FS#2874 | ||
* | Merge pull request #405 from splitbrain/FS#2409localizetemplatephp | Andreas Gohr | 2013-11-01 |
|\ | | | | | Localize some meta header titels. Fixes FS#2409 |