Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #453 from splitbrain/DokuCSSFile_Comments | Christopher Smith | 2013-12-01 |
|\ | | | | | improved comments for code associated with PR#407 & PR#408 | ||
| * | improved comments for code associated with PR#407 & PR#408 | Christopher Smith | 2013-11-26 |
| | | |||
* | | Merge pull request #455 from splitbrain/user_importexport_fixes | Christopher Smith | 2013-12-01 |
|\ \ | | | | | | | Usermanager import/export fixes | ||
| * | | remove incorrect 'private' restriction from tset method | Christopher Smith | 2013-12-01 |
| | | | |||
| * | | comment (hide) incomplete export with filter test | Christopher Smith | 2013-12-01 |
| | | | |||
| * | | Per FS#2884, implement a local version of str_getcsv() to maintain | Christopher Smith | 2013-12-01 |
| | | | | | | | | | | | | | | | compatibility with php 5.2.x (str_getcsv() is only available in php 5.3+ and is used by user manager import feature. | ||
| * | | test import against auth plugin which doesn't allow adding users | Christopher Smith | 2013-11-28 |
| | | | |||
| * | | Add unit tests for usermanager import & export functions | Christopher Smith | 2013-11-28 |
| | | | |||
| * | | Improvements to facilitate unit testing | Christopher Smith | 2013-11-28 |
| | | | | | | | | | | | | | | | | | | - don't die at end of _export() - internal classs wrapper method for is_uploaded_file() to allow overriding for use under cli & without having to upload a file | ||
| * | | MINOR: comment spelling corrections | Christopher Smith | 2013-11-28 |
| | | | |||
| * | | IMPROVEMENT: remove generated password from import failure data | Christopher Smith | 2013-11-28 |
| | | | |||
| * | | Bugfix: correct variable name to | Christopher Smith | 2013-11-28 |
| |/ | |||
* | | Merge pull request #458 from dokuwiki-translate/lang_update_525 | Andreas Gohr | 2013-12-01 |
|\ \ | | | | | | | Translation update (el) | ||
| * | | translation update | chris taklis | 2013-11-30 |
| |/ | |||
* / | translation update | Juliano Marconi Lanigra | 2013-11-30 |
|/ | |||
* | translation update | Garam | 2013-11-25 |
| | |||
* | translation update | Boris | 2013-11-25 |
| | |||
* | Merge pull request #443 from dokuwiki-translate/lang_update_508 | Andreas Gohr | 2013-11-25 |
|\ | | | | | Translation update (no) | ||
| * | translation update | Thomas Juberg | 2013-11-24 |
| | | |||
* | | Merge pull request #444 from dokuwiki-translate/lang_update_511 | Andreas Gohr | 2013-11-25 |
|\ \ | | | | | | | Translation update (pl) | ||
| * | | translation update | Tomasz Bosak | 2013-11-24 |
| |/ | |||
* | | Merge pull request #446 from dokuwiki-translate/lang_update_514 | Andreas Gohr | 2013-11-25 |
|\ \ | | | | | | | Translation update (it) | ||
| * | | translation update | Claudio Lanconelli | 2013-11-25 |
| | | | |||
* | | | translation update | Jérôme Brandt | 2013-11-25 |
|/ / | |||
* | | Merge pull request #439 from dokuwiki-translate/lang_update_503 | Andreas Gohr | 2013-11-24 |
|\ \ | | | | | | | Translation update (fi) | ||
| * | | translation update | Rami Lehti | 2013-11-24 |
| | | | |||
* | | | Merge pull request #438 from dokuwiki-translate/lang_update_502 | Andreas Gohr | 2013-11-24 |
|\ \ \ | |_|/ |/| | | Translation update (ko) | ||
| * | | translation update | Myeongjin | 2013-11-24 |
| |/ | |||
* | | Merge pull request #433 from dokuwiki-translate/lang_update_499 | Andreas Gohr | 2013-11-23 |
|\ \ | | | | | | | Translation update (ja) | ||
| * | | translation update | Satoshi Sahara | 2013-11-19 |
| |/ | |||
* | | Merge pull request #432 from dokuwiki-translate/lang_update_498 | Anika Henke | 2013-11-21 |
|\ \ | | | | | | | Translation update (nl) | ||
| * | | translation update | Gerrit Uitslag | 2013-11-18 |
| |/ | |||
* / | translation update | Benedikt Fey | 2013-11-18 |
|/ | |||
* | Merge pull request #406 from splitbrain/remove-deprecated-stuff | Christopher Smith | 2013-11-17 |
|\ | | | | | Remove deprecated stuff | ||
| * | removed deprecated images | Anika Henke | 2013-11-04 |
| | | |||
| * | removed loading of deprecated RTL styles | 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 |
| | | | |||
| * | | 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 |
| |/ | |||
* | | 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 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) |