summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #261 from splitbrain/acl_tokensubstitution_fixesAndreas Gohr2013-08-03
|\ | | | | Acl tokensubstitution fixes
| * fix a bug in acl manager where it attempted to correct too high page ↵Christopher Smith2013-08-03
| | | | | | | | permission levels using the wrong var
| * Fix a couple of bugs in ACL substitution mechanismChristopher Smith2013-08-03
| | | | | | | | | | | | | | | | | | - %GROUP% & %USER% can now both be used in the same rule, e.g. %GROUP%:%USER% 2 - rules with tokens will be skipped when the user is not logged in previously %USER% was attempted
* | fixed cleanPath bug in tar library FS#2802Andreas Gohr2013-08-03
| | | | | | | | | | | | | | | | | | | | | | | | This time the test case was correct and actually showed a bug in the tar library. The error occured only on the first build (directory build/0/) where the zero was stripped from the path name. I added unit tests to the cleanPath function and discovered another bug with handling relative directories. I rewrote the cleanPath() function and now it should finally work. Unit tests FTW!
* | Merge pull request #259 from splitbrain/lessify-pagetoolsAnika Henke2013-08-03
|\ \ | |/ |/| Lessify pagetools
| * corrected comment in pagetools-item() mixinAnika Henke2013-08-03
| |
| * use only one mixin name for pagetoolsAndreas Gohr2013-08-03
| | | | | | | | less will use the right one based on parameter counts
| * 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)