summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* 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 #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
| |/ / /
* / / / 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 #445 from dokuwiki-translate/lang_update_512Andreas Gohr2013-11-25
|\ \ | | | | | | Translation update (de-informal)
| * | translation updateJanosch2013-11-25
| | |
* | | 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 pull request #430 from splitbrain/change-installer-allowregAnika Henke2013-11-17
|\ | | | | swapped logic for allowing/disabling registration in installer
| * swapped logic for allowing/disabling registration in installerAnika Henke2013-11-17
| |
* | Merge pull request #406 from splitbrain/remove-deprecated-stuffChristopher Smith2013-11-17
|\ \ | |/ |/| Remove deprecated stuff
| * Revert "deleted wrongly added file"Anika Henke2013-11-04
| | | | | | | | This reverts commit 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c.
| * deleted another wronlgy added fileAnika Henke2013-11-04
| |
| * deleted wrongly added fileAnika Henke2013-11-04
| |
| * removed deprecated html_attbuild()Anika Henke2013-11-04
| |
| * removed deprecated tpl_getFavicon()Anika Henke2013-11-04
| |
| * removed loading of deprecated RTL stylesAnika Henke2013-11-04
| |
| * removed deprecated third param of cleanID()Anika Henke2013-11-04
| |
* | Merge pull request #408 from splitbrain/approve-users-acl-policyAnika Henke2013-11-17
|\ \ | | | | | | Add possibility to approve users in installer's ACL policy
| * | changed user approval option to disable registration option in installerAnika Henke2013-11-17
| | |
| * | added possibility to approve users to ACL policies in installerAnika Henke2013-11-09
| |/
* | Merge pull request #428 from dokuwiki-translate/lang_update_489Andreas Gohr2013-11-17
|\ \ | | | | | | Translation update (eo)
| * | translation updateRobert Bogenschneider2013-11-17
| | |
* | | translation updateMyeongjin2013-11-17
|/ /
* | Merge pull request #425 from dokuwiki-translate/lang_update_487Anika Henke2013-11-16
|\ \ | | | | | | Translation update (ko)
| * | translation updateMyeongjin2013-11-16
| | |