summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* lessified pagetools items, added mixins simplify maintenanceAnika Henke2013-08-03
|
* fixed old pagetools sprite loading from cache when hoveringAnika Henke2013-08-03
|
* Merge pull request #235 from haobug/masterAndreas Gohr2013-08-03
|\ | | | | Improve Linkwizard, make it can be used more than once
| * Improve Linkwizard, make it can be used more than once.haobug2013-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/fetchimagetokexternalAndreas Gohr2013-08-03
|\ \ | | | | | | Added check of token in fetch.php for external images.
| * \ Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-08-02
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-08-01
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-08-01
| |\ \ \ \
| * | | | | remove hash for external images, but use token url parameter insteadKlap-in2013-08-01
| | | | | |
| * | | | | Updated tests, removed hashKlap-in2013-08-01
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-08-01
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-07-21
| |\ \ \ \ \ \
| * | | | | | | update hashes in testsKlap-in2013-06-09
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into fetchimagetokexternalKlap-in2013-06-09
| |\ \ \ \ \ \ \
| * | | | | | | | fix some minor typos in fetch_imagetoken.test.phpKlap-in2013-05-21
| | | | | | | | |
| * | | | | | | | Add check for token when resizing and caching external imagesKlap-in2013-05-21
| | | | | | | | |
| * | | | | | | | tests for fetch.php of external filesKlap-in2013-05-21
| | | | | | | | |
* | | | | | | | | Merge pull request #186 from splitbrain/configmgr_improvementsAndreas Gohr2013-08-03
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Configmgr improvements
| * \ \ \ \ \ \ \ \ Merge branch 'master' into configmgr_improvementsChristopher Smith2013-08-03
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into configmgr_improvementsChristopher Smith2013-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 typosAndreas Gohr2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | Simplified Chinese language updatelainme2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | Italian language updateLorenzo Radaelli2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | Fix double encoding in rss syntax FS#2731Michael Hamann2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | little change to syntax we had on the life siteAndreas Gohr2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | add unit test for pageinfo()Christopher Smith2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | Fix remaining missing $INPUT uses FS#2577Michael Hamann2013-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.
| * | | | | | | | | | | Revert the search depth behavior changes from #154Michael Hamann2013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts parts of the changes from #154: Before merging the pull request, a depth of 1 returned just the pages in the root namespace. With the changes in the pull request, a depth of 1 also returned pages in subnamespaces of the root namespace (as it was also tested in the test case). This reverts this part of the changes and a depth of 1 returns just the pages in the root namespace again.
| * | | | | | | | | | | Fix handling of failed authentication loadingMichael Hamann2013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a failed authentication initialization, the authentication setup was simply continued with an unset $auth object. This restores the previous behavior (before merging #141) of simply returning after unsetting $auth. Furthermore this re-introduces the check if $auth is set before checking $auth and removes a useless check if $auth is true (could never be false).
| * | | | | | | | | | | Update inc/template.phparbrk12013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed nonexistant actionOk to actionOK
| * | | | | | | | | | | fixed auth_browseruid on IE9Dominik Eckelmann2013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE9 send different HTTP_ACCEPT_LANGUAGE header on ajax request. This causes different results from auth_browseruid. This patch removes the HTTP_ACCEPT_LANGUAGE from the browser id calculation.
| * | | | | | | | | | | add security token back, but not for anonymous usersChristopher Smith2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | remove security token from tpl_actiondropdown - its not necessary, we're not ↵Christopher Smith2013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | posting any system change
| * | | | | | | | | | | change tpl_actiondropdown request method to 'get'Christopher Smith2013-02-24
| | | | | | | | | | | |
| * | | | | | | | | | | replace preset _cautionList property with _caution config metadata ↵Christopher Smith2013-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter, plugins can now easily set cautions on their settings
| * | | | | | | | | | | fix security caution for 'remote' setting (was 'xmlrpc')Christopher Smith2013-02-18
| | | | | | | | | | | |
| * | | | | | | | | | | FS#2722 add settings_regex class, use it for hidepagesChristopher Smith2013-02-18
| | | | | | | | | | | |
| * | | | | | | | | | | remove no longer used email pattern, validation is done by mail_* functionsChristopher Smith2013-02-18
| | | | | | | | | | | |
| * | | | | | | | | | | remove php_strip_whitespace() alternate, no longer required as php min req't ↵Christopher Smith2013-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensures its always present
| * | | | | | | | | | | add comments for recent settings class additions to extra.class.phpChristopher Smith2013-02-18
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #258 from dokuwiki-translate/lang_update_10Andreas Gohr2013-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Translation update (sv)
| * | | | | | | | | | | translation updateHenrik2013-08-03
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #257 from lupo49/masterAndreas Gohr2013-08-02
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Re-enable displaying the date in the revert manager (Fixes FS#2073)
| * | | | | | | | | | | Re-enable displaying the date in the revert manager (Fixes FS#2073)Matthias Schulte2013-08-03
|/ / / / / / / / / / /
* | | | | | | | | | | removed a merge conflict I missed on mergeAndreas Gohr2013-08-02
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'less'Andreas Gohr2013-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 errorsAndreas Gohr2013-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now gives proper files and line numbers for errors
| * | | | | | | | | | | removed possibility to have rtl.less files in pluginsAnika Henke2013-07-31
| | | | | | | | | | | |
| * | | | | | | | | | | switched to LESS variables in rest of template's css filesAnika Henke2013-07-31
| | | | | | | | | | | |
| * | | | | | | | | | | unlessified and lessified a few more cssAnika Henke2013-07-30
| | | | | | | | | | | |