summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stableGuy Brand2013-12-08
|\
| * crlf 2 lf whitespace fixesAnika Henke2013-12-07
| |
| * translation updateMyeongjin2013-12-07
| |
| * translation updateanjianshi2013-12-05
| |
| * translation updatezamroni2013-12-03
| |
| * translation updateAntonio Bueno2013-12-02
| |
| * Merge branch 'lang_update_507' of ↵Andreas Gohr2013-12-01
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-442 * 'lang_update_507' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: inc/lang/fi/lang.php
| | * translation updateOtto Vainio2013-11-24
| | |
| * | Merge branch 'lang_update_518' of ↵Andreas Gohr2013-12-01
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-450 * 'lang_update_518' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/usermanager/lang/ko/lang.php
| | * | translation updateGaram2013-11-25
| | | |
| * | | Merge pull request #451 from splitbrain/fs2888Andreas Gohr2013-12-01
| |\ \ \ | | | | | | | | | | fix numeric expression read in plugin default conf FS#2888
| | * | | FS#2888 fix for templatesAndreas Gohr2013-11-26
| | | | |
| | * | | fix numeric expression read in plugin default conf FS#2888Andreas Gohr2013-11-26
| | | | |
| * | | | Merge pull request #453 from splitbrain/DokuCSSFile_CommentsChristopher Smith2013-12-01
| |\ \ \ \ | | | | | | | | | | | | improved comments for code associated with PR#407 & PR#408
| | * | | | improved comments for code associated with PR#407 & PR#408Christopher Smith2013-11-26
| | |/ / /
| * | | | Merge pull request #455 from splitbrain/user_importexport_fixesChristopher Smith2013-12-01
| |\ \ \ \ | | | | | | | | | | | | Usermanager import/export fixes
| | * | | | remove incorrect 'private' restriction from tset methodChristopher Smith2013-12-01
| | | | | |
| | * | | | comment (hide) incomplete export with filter testChristopher Smith2013-12-01
| | | | | |
| | * | | | Per FS#2884, implement a local version of str_getcsv() to maintainChristopher Smith2013-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 usersChristopher Smith2013-11-28
| | | | | |
| | * | | | Add unit tests for usermanager import & export functionsChristopher Smith2013-11-28
| | | | | |
| | * | | | Improvements to facilitate unit testingChristopher Smith2013-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 correctionsChristopher Smith2013-11-28
| | | | | |
| | * | | | IMPROVEMENT: remove generated password from import failure dataChristopher Smith2013-11-28
| | | | | |
| | * | | | Bugfix: correct variable name toChristopher Smith2013-11-28
| | |/ / /
| * | | | Merge pull request #458 from dokuwiki-translate/lang_update_525Andreas Gohr2013-12-01
| |\ \ \ \ | | | | | | | | | | | | Translation update (el)
| | * | | | translation updatechris taklis2013-11-30
| | |/ / /
| * / / / translation updateJuliano Marconi Lanigra2013-11-30
| |/ / /
| * / / translation updateGaram2013-11-25
| |/ /
| * | translation updateBoris2013-11-25
| | |
| * | Merge pull request #443 from dokuwiki-translate/lang_update_508Andreas Gohr2013-11-25
| |\ \ | | | | | | | | Translation update (no)
| | * | translation updateThomas Juberg2013-11-24
| | |/
| * | Merge pull request #444 from dokuwiki-translate/lang_update_511Andreas Gohr2013-11-25
| |\ \ | | | | | | | | Translation update (pl)
| | * | translation updateTomasz Bosak2013-11-24
| | |/
| * | Merge pull request #446 from dokuwiki-translate/lang_update_514Andreas Gohr2013-11-25
| |\ \ | | | | | | | | Translation update (it)
| | * | translation updateClaudio Lanconelli2013-11-25
| | | |
| * | | translation updateJérôme Brandt2013-11-25
| |/ /
| * | Merge pull request #439 from dokuwiki-translate/lang_update_503Andreas Gohr2013-11-24
| |\ \ | | | | | | | | Translation update (fi)
| | * | translation updateRami Lehti2013-11-24
| | | |
| * | | Merge pull request #438 from dokuwiki-translate/lang_update_502Andreas Gohr2013-11-24
| |\ \ \ | | |_|/ | |/| | Translation update (ko)
| | * | translation updateMyeongjin2013-11-24
| | |/
| * | Merge pull request #433 from dokuwiki-translate/lang_update_499Andreas Gohr2013-11-23
| |\ \ | | | | | | | | Translation update (ja)
| | * | translation updateSatoshi Sahara2013-11-19
| | |/
| * | Merge pull request #432 from dokuwiki-translate/lang_update_498Anika Henke2013-11-21
| |\ \ | | | | | | | | Translation update (nl)
| | * | translation updateGerrit Uitslag2013-11-18
| | |/
| * / translation updateBenedikt Fey2013-11-18
| |/
* | Merge branch 'master' into stableGuy Brand2013-11-18
|\|
| * Merge pull request #406 from splitbrain/remove-deprecated-stuffChristopher Smith2013-11-17
| |\ | | | | | | Remove deprecated stuff
| | * removed deprecated imagesAnika Henke2013-11-04
| | |
| | * removed loading of deprecated RTL stylesAnika Henke2013-11-04
| | |