Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | added style.local.ini to cache files | Anika Henke | 2013-08-03 |
| | |||
* | Merge pull request #262 from splitbrain/confstyleini | Anika Henke | 2013-08-03 |
|\ | | | | | allow for a style.ini in conf/<tpl>/style.ini | ||
| * | Merge remote-tracking branch 'origin/confstyleini' into confstyleini | Anika Henke | 2013-08-03 |
| |\ | |||
| | * | removed debug statement | Andreas Gohr | 2013-08-03 |
| | | | |||
| * | | fixed conf style.ini not working due to wrong incbase path | Anika Henke | 2013-08-03 |
| |/ | |||
| * | Readded style.local.ini and deprecated it | Andreas Gohr | 2013-08-03 |
| | | |||
| * | allow for a style.ini in conf/<tpl>/style.ini | Andreas Gohr | 2013-08-03 |
| | | | | | | | | | | | | This is another go at what pull request #227 tried to do. This removes support for a style.local.ini in the template file in preference of a style.ini in the conf folder | ||
* | | Merge pull request #260 from lupo49/master | Andreas Gohr | 2013-08-03 |
|\ \ | | | | | | | Populate global variable JSINFO also in the Media Manager popup / Replaces \r\n with \n | ||
| * | | JSINFO in Media Manager: Initialize with empty array, as $ID and $NS | Matthias Schulte | 2013-08-03 |
| | | | | | | | | | | | | | | | aren't useful and available. This is just for adding more values in e. g. an action plugin. | ||
| * | | Populate global variable JSINFO also in the Media Manager popup | Matthias Schulte | 2013-08-03 |
| |/ | |||
* | | Merge pull request #261 from splitbrain/acl_tokensubstitution_fixes | Andreas Gohr | 2013-08-03 |
|\ \ | | | | | | | Acl tokensubstitution fixes | ||
| * | | fix a bug in acl manager where it attempted to correct too high page ↵ | Christopher Smith | 2013-08-03 |
| |/ | | | | | | | permission levels using the wrong var | ||
* | | corrected comment in pagetools-item() mixin | Anika Henke | 2013-08-03 |
| | | |||
* | | use only one mixin name for pagetools | Andreas Gohr | 2013-08-03 |
| | | | | | | | | less will use the right one based on parameter counts | ||
* | | lessified pagetools items, added mixins simplify maintenance | Anika Henke | 2013-08-03 |
|/ | |||
* | fixed old pagetools sprite loading from cache when hovering | Anika Henke | 2013-08-03 |
| | |||
* | Merge pull request #235 from haobug/master | Andreas Gohr | 2013-08-03 |
|\ | | | | | Improve Linkwizard, make it can be used more than once | ||
| * | Improve Linkwizard, make it can be used more than once. | haobug | 2013-06-28 |
| | | | | | | | | | | | | | | | | As reported in https://forum.dokuwiki.org/thread/9988 the previous implementation can not handle the situation of use the linkwiz more than once. Now you can use in you toolbar plugin 'type' => 'linkwiz' to make use of the handy Linkwizard for choosing the wiki pages. | ||
* | | Merge pull request #224 from splitbrain/fetchimagetokexternal | Andreas Gohr | 2013-08-03 |
|\ \ | | | | | | | Added check of token in fetch.php for external images. | ||
| * \ | Merge remote-tracking branch 'origin/master' into fetchimagetokexternal | Klap-in | 2013-08-02 |
| |\ \ | |||
| * \ \ | Merge remote-tracking branch 'origin/master' into fetchimagetokexternal | Klap-in | 2013-08-01 |
| |\ \ \ | |||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into fetchimagetokexternal | Klap-in | 2013-08-01 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into fetchimagetokexternal | Klap-in | 2013-07-21 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into fetchimagetokexternal | Klap-in | 2013-06-09 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | Add check for token when resizing and caching external images | Klap-in | 2013-05-21 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #186 from splitbrain/configmgr_improvements | Andreas Gohr | 2013-08-03 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Configmgr improvements | ||
| * \ \ \ \ \ \ \ | Merge branch 'master' into configmgr_improvements | Christopher Smith | 2013-08-03 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into configmgr_improvements | Christopher Smith | 2013-07-30 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/auth.php inc/template.php lib/plugins/authad/lang/zh/settings.php lib/plugins/authldap/lang/en/settings.php lib/plugins/authldap/lang/zh/settings.php lib/plugins/authmysql/lang/zh/settings.php lib/plugins/config/settings/config.class.php lib/plugins/usermanager/admin.php | ||
| * | | | | | | | | | | fixed typos | Andreas Gohr | 2013-02-24 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Simplified Chinese language update | lainme | 2013-02-24 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Italian language update | Lorenzo Radaelli | 2013-02-24 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Fix remaining missing $INPUT uses FS#2577 | Michael Hamann | 2013-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds $INPUT in all places where it was still missing and available. $INPUT is now also used in places where using $_REQUEST/... was okay in order to make the code consistent. | ||
| * | | | | | | | | | | replace preset _cautionList property with _caution config metadata ↵ | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter, plugins can now easily set cautions on their settings | ||
| * | | | | | | | | | | fix security caution for 'remote' setting (was 'xmlrpc') | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | FS#2722 add settings_regex class, use it for hidepages | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | remove no longer used email pattern, validation is done by mail_* functions | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | remove php_strip_whitespace() alternate, no longer required as php min req't ↵ | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensures its always present | ||
| * | | | | | | | | | | add comments for recent settings class additions to extra.class.php | Christopher Smith | 2013-02-18 |
| | | | | | | | | | | | |||
* | | | | | | | | | | | translation update | Henrik | 2013-08-03 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Re-enable displaying the date in the revert manager (Fixes FS#2073) | Matthias Schulte | 2013-08-03 |
| | | | | | | | | | | |||
* | | | | | | | | | | removed a merge conflict I missed on merge | Andreas Gohr | 2013-08-02 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge branch 'less' | Andreas Gohr | 2013-08-02 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * less: check less compilation for errors removed possibility to have rtl.less files in plugins switched to LESS variables in rest of template's css files unlessified and lessified a few more css fixed broken structure removed debug statement. sorry convert ini replacements to less vars first make sure calculations are correct lessified more files lessyfied another one lessyfied the first of template's CSS files fixed ini replacement to less variables stuff added missing lessc library add LESS support Conflicts: inc/load.php lib/tpl/dokuwiki/css/basic.less | ||
| * | | | | | | | | | | check less compilation for errors | Andreas Gohr | 2013-08-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now gives proper files and line numbers for errors | ||
| * | | | | | | | | | | removed possibility to have rtl.less files in plugins | Anika Henke | 2013-07-31 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | switched to LESS variables in rest of template's css files | Anika Henke | 2013-07-31 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | unlessified and lessified a few more css | Anika Henke | 2013-07-30 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | fixed broken structure | Anika Henke | 2013-07-30 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | removed debug statement. sorry | Andreas Gohr | 2013-07-30 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | convert ini replacements to less vars first | Andreas Gohr | 2013-07-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to safely overwrite ini replacements from within any less file | ||
| * | | | | | | | | | | make sure calculations are correct | Andreas Gohr | 2013-07-30 |
| | | | | | | | | | | |