summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #263 from splitbrain/mediamanager_list_orderingAndreas Gohr2013-08-04
|\ | | | | Mediamanager list ordering
| * show media files in date order (most recent first) after an upload is completedChristopher Smith2013-08-03
| |
| * fix the default ordering of media files to be "natural".Christopher Smith2013-08-03
| | | | | | | | also allow the order to be specified in more places.
| * move the media search formlet upChristopher Smith2013-08-03
| | | | | | | | | | | | | | Currently the search box is below the media file list, where it is effectively inaccessible in a namespace with lots of files. This change moves the search box above the media file list and below the upload form.
* | Merge pull request #264 from splitbrain/authconfigdangerAndreas Gohr2013-08-04
|\ \ | | | | | | Authconfigdanger
| * | change 'debug' setting to 'security' (rather than 'danger')Christopher Smith2013-08-03
| | |
| * | add 'danger' alert to authpgsql config settingsChristopher Smith2013-08-03
| | |
| * | add 'danger' alert to authmysql config settingsChristopher Smith2013-08-03
| | |
| * | add 'danger' alert to authldap config settingsChristopher Smith2013-08-03
| | |
| * | add 'danger' alert to authad config settingsChristopher Smith2013-08-03
| |/
* | Merge pull request #254 from splitbrain/user_importexportAndreas Gohr2013-08-04
|\ \ | | | | | | User importexport
| * | convert from iso-8859-1 if not utf8Christopher Smith2013-08-03
| | |
| * | style improvementsChristopher Smith2013-08-02
| | |
| * | enable email notifications & alert messages for imported usersChristopher Smith2013-08-02
| | |
| * | add csv import functionality to the user managerChristopher Smith2013-08-02
| | |
| * | add csv export functionality to the user managerChristopher Smith2013-08-01
| | |
* | | Merge pull request #268 from splitbrain/FS#2806Andreas Gohr2013-08-04
|\ \ \ | | | | | | | | FS#2806 - fix auth capability listing in html_debug()
| * | | FS#2806 - fix auth capability listing in html_debug()Christopher Smith2013-08-04
| | | |
* | | | Merge pull request #267 from dokuwiki-translate/lang_update_26Andreas Gohr2013-08-04
|\ \ \ \ | | | | | | | | | | Translation update (nl)
| * | | | translation updatemprins2013-08-04
|/ / / /
* / / / FS#2829 check if auth_random is available in PassHashAndreas Gohr2013-08-04
|/ / /
* | | added missing defaultAndreas Gohr2013-08-03
| | |
* | | FS#2677 support arrays in to, cc, bcc headers in MailerAndreas Gohr2013-08-03
| | | | | | | | | | | | This does not fix FS#2677, it only adds support for fixing it later.
* | | added style.local.ini to cache filesAnika Henke2013-08-03
| | |
* | | Merge pull request #262 from splitbrain/confstyleiniAnika Henke2013-08-03
|\ \ \ | | | | | | | | allow for a style.ini in conf/<tpl>/style.ini
| * \ \ Merge remote-tracking branch 'origin/confstyleini' into confstyleiniAnika Henke2013-08-03
| |\ \ \
| | * | | removed debug statementAndreas Gohr2013-08-03
| | | | |
| * | | | fixed conf style.ini not working due to wrong incbase pathAnika Henke2013-08-03
| |/ / /
| * | | Readded style.local.ini and deprecated itAndreas Gohr2013-08-03
| | | |
| * | | allow for a style.ini in conf/<tpl>/style.iniAndreas Gohr2013-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/masterAndreas Gohr2013-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 $NSMatthias Schulte2013-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 popupMatthias Schulte2013-08-03
| |/ /
* | | 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
| | | | | | |