Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into diff_navigation | Gerrit Uitslag | 2013-11-19 |
|\ | |||
| * | Release preparation | Guy Brand | 2013-11-18 |
| | | |||
| * | Merge pull request #430 from splitbrain/change-installer-allowreg | Anika Henke | 2013-11-17 |
| |\ | | | | | | | swapped logic for allowing/disabling registration in installer | ||
| | * | swapped logic for allowing/disabling registration in installer | Anika Henke | 2013-11-17 |
| | | | |||
| * | | ensure css loadfile test doesn't try to create a directory (and fail) if the ↵ | Christopher Smith | 2013-11-17 |
| | | | | | | | | | | | | directory already exists | ||
| * | | Merge pull request #406 from splitbrain/remove-deprecated-stuff | Christopher Smith | 2013-11-17 |
| |\ \ | | | | | | | | | Remove deprecated stuff | ||
| | * | | Revert "deleted wrongly added file" | Anika Henke | 2013-11-04 |
| | | | | | | | | | | | | | | | | This reverts commit 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c. | ||
| | * | | deleted another wronlgy added file | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | deleted wrongly added file | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | removed deprecated images | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | removed deprecated html_attbuild() | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | removed deprecated tpl_getFavicon() | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | removed loading of deprecated RTL styles | Anika Henke | 2013-11-04 |
| | | | | |||
| | * | | removed deprecated third param of cleanID() | Anika Henke | 2013-11-04 |
| | | | | |||
| * | | | Merge pull request #407 from splitbrain/FS#2875 | Christopher Smith | 2013-11-17 |
| |\ \ \ | | |_|/ | |/| | | FS#2875 : Allow less to parse @import of .less files | ||
| | * | | refactor to improve elegance | Christopher Smith | 2013-11-11 |
| | | | | |||
| | * | | fix sp. in comment | Christopher Smith | 2013-11-11 |
| | | | | |||
| | * | | Test to ensure less can parse the @import rewritten by css_loadfile() | Christopher Smith | 2013-11-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is horrible, but I believe necessary to ensure that the @import of less files actually works. It is horrible as its not a unit test and its not a true functional test. It probably implies the code in css_out() should be refactored to make it easier to test intermediate results. | ||
| | * | | additional tests where for relative path to @import less file | Christopher Smith | 2013-11-05 |
| | | | | |||
| | * | | update url/file rewriting in css_loadfile() to support @import of less files | Christopher Smith | 2013-11-05 |
| | | | | |||
| | * | | add DOKU_INC to less import directories | Christopher Smith | 2013-11-05 |
| | | | | |||
| | * | | Improve css_loadfile() tests | Christopher Smith | 2013-11-05 |
| | |/ | | | | | | | | | | | | | | | | | | | - use TMP_DIR constant rather than /tmp - swap order of parameters in csstest() to match reported 'expected' & 'actual' - add tests for use of 'url()' in @import - add tests for @import of '.less' files (these test will fail per FS#2875) | ||
| * | | 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 |