summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #469 from splitbrain/fix-crlfAnika Henke2013-12-08
|\ | | | | CRLF 2 LF whitespace fixes
| * crlf 2 lf whitespace fixesAnika Henke2013-12-07
|/
* fixed editing of RTL and LTR scripts mix (including a lot of wiki syntax) ↵Anika Henke2013-12-07
| | | | | | | | | being a mess Bi-directionality is generally a huge pain in the arm, browser vendors only added a few improvements quite recently. This fix only works in Mozilla and Webkit currently. Affected syntax was links and media and all opening and closing syntax (e.g. code and del and various plugin syntax).
* Merge pull request #468 from dokuwiki-translate/lang_update_542Andreas Gohr2013-12-06
|\ | | | | Translation update (ko)
| * translation updateMyeongjin2013-12-07
|/
* Merge pull request #464 from splitbrain/hidden_rssAndreas Gohr2013-12-05
|\ | | | | Properly fix RSS namespace listings containing hidden pages FS#2891
| * Fix RSS namespace listings containing hidden pagesMichael Hamann2013-12-02
| |
| * Revert "Exclude hidden pages (config["hidepages"]) from RSS feed (see ↵Michael Hamann2013-12-02
| | | | | | | | | | | | https://www.dokuwiki.org/config:hidepages)" This reverts commit f5151bdbf999043dfe1ba73a684d37b27ff6e021.
| * Revert "fix indention of RSS patch"Michael Hamann2013-12-02
| | | | | | | | This reverts commit a010fc32a9c11bfbe8a82ad55fdec134d2476306.
* | Merge pull request #467 from dokuwiki-translate/lang_update_537Andreas Gohr2013-12-04
|\ \ | | | | | | Translation update (zh)
| * | translation updateanjianshi2013-12-05
|/ /
* | Merge pull request #461 from splitbrain/mail_headersAndreas Gohr2013-12-03
|\ \ | | | | | | Fix sending empty and duplicated headers, FS#2887
| * | Fix sending empty and duplicated headers, FS#2887Michael Hamann2013-12-01
| |/ | | | | | | | | | | This fixes sending empty and duplicated To/Cc/Bcc, Subject and From headers in the additional headers. The To-header in the additional headers prevented mail sending on some systems.
* | Merge pull request #466 from dokuwiki-translate/lang_update_534Andreas Gohr2013-12-03
|\ \ | | | | | | Translation update (id)
| * | translation updatezamroni2013-12-03
|/ /
* | Merge pull request #465 from dokuwiki-translate/lang_update_532Andreas Gohr2013-12-02
|\ \ | | | | | | Translation update (es)
| * | translation updateAntonio Bueno2013-12-02
| |/
* | Merge pull request #463 from dokuwiki-translate/lang_update_531Andreas Gohr2013-12-02
|\ \ | |/ |/| Translation update (bn)
| * translation updateFoysol2013-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 #460 from splitbrain/FS#1833_bChristopher Smith2013-12-01
|\ \ \ \ | | | | | | | | | | FS#1833 (b)
| * | | | FS#1833 (b)Christopher Smith2013-12-01
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Prevent table entry syntax swallowing multiple preceeding blank lines (a) this shouldn't be necessary, blank lines are handled by paragraph processing (b) avoids issues with greedy table syntax competing with plugins
* | | | Merge pull request #457 from dokuwiki-translate/lang_update_524Andreas Gohr2013-12-01
|\ \ \ \ | | | | | | | | | | Translation update (sl)
| * | | | translation updateMatej Urbančič2013-11-30
| |/ / /
* | | | Merge pull request #458 from dokuwiki-translate/lang_update_525Andreas Gohr2013-12-01
|\ \ \ \ | | | | | | | | | | Translation update (el)
| * | | | translation updatechris taklis2013-11-30
| |/ / /
* | | | Merge pull request #459 from dokuwiki-translate/lang_update_526Andreas Gohr2013-12-01
|\ \ \ \ | |/ / / |/| | | Translation update (pt-br)
| * | | translation updateJuliano Marconi Lanigra2013-11-30
|/ / /
* | | Merge pull request #449 from dokuwiki-translate/lang_update_517Andreas Gohr2013-11-25
|\ \ \ | |/ / |/| | Translation update (ko)
| * | translation updateGaram2013-11-25
|/ /
* | Merge pull request #448 from dokuwiki-translate/lang_update_516Andreas Gohr2013-11-25
|\ \ | | | | | | Translation update (no)
| * | translation updateBoris2013-11-25
|/ /