summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2013-11-19
|\
| * Release preparationGuy Brand2013-11-18
| * Merge pull request #430 from splitbrain/change-installer-allowregAnika Henke2013-11-17
| |\
| | * swapped logic for allowing/disabling registration in installerAnika Henke2013-11-17
| * | ensure css loadfile test doesn't try to create a directory (and fail) if the ...Christopher Smith2013-11-17
| * | Merge pull request #406 from splitbrain/remove-deprecated-stuffChristopher Smith2013-11-17
| |\ \
| | * | Revert "deleted wrongly added file"Anika Henke2013-11-04
| | * | deleted another wronlgy added fileAnika Henke2013-11-04
| | * | deleted wrongly added fileAnika Henke2013-11-04
| | * | removed deprecated imagesAnika 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 #407 from splitbrain/FS#2875Christopher Smith2013-11-17
| |\ \ \ | | |_|/ | |/| |
| | * | refactor to improve eleganceChristopher Smith2013-11-11
| | * | fix sp. in commentChristopher Smith2013-11-11
| | * | Test to ensure less can parse the @import rewritten by css_loadfile()Christopher Smith2013-11-05
| | * | additional tests where for relative path to @import less fileChristopher Smith2013-11-05
| | * | update url/file rewriting in css_loadfile() to support @import of less filesChristopher Smith2013-11-05
| | * | add DOKU_INC to less import directoriesChristopher Smith2013-11-05
| | * | Improve css_loadfile() testsChristopher Smith2013-11-05
| | |/
| * | Merge pull request #408 from splitbrain/approve-users-acl-policyAnika Henke2013-11-17
| |\ \
| | * | changed user approval option to disable registration option in installerAnika Henke2013-11-17
| | * | removed redundant lineAnika Henke2013-11-10
| | * | changed how to approve users in installer ACL policyAnika Henke2013-11-09
| | * | added possibility to approve users to ACL policies in installerAnika Henke2013-11-09
| * | | Merge pull request #427 from splitbrain/improve_template_eventAnika Henke2013-11-17
| |\ \ \
| | * | | removed tpl from TEMPLATE_PAGETOOLS_DISPLAY event as it's always available inAnika Henke2013-11-17
| | * | | Improved pagetools event in dokuwiki templateAnika Henke2013-11-16
| * | | | Merge pull request #421 from splitbrain/FS#2879Christopher Smith2013-11-17
| |\ \ \ \
| | * | | | Fix an issue with style.ini replacements values not having relativeChristopher Smith2013-11-12
| * | | | | Merge pull request #428 from dokuwiki-translate/lang_update_489Andreas Gohr2013-11-17
| |\ \ \ \ \
| | * | | | | translation updateRobert Bogenschneider2013-11-17
| * | | | | | Merge pull request #429 from dokuwiki-translate/lang_update_492Andreas Gohr2013-11-17
| |\ \ \ \ \ \
| | * | | | | | translation updateMyeongjin2013-11-17
| | |/ / / / /
| * | | | | | Merge branch 'lang_update_466' of github.com:dokuwiki-translate/dokuwiki into...Anika Henke2013-11-16
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | translation updatesoer96482013-11-12
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into lang_update_464Anika Henke2013-11-16
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #426 from araname/masterAnika Henke2013-11-16
| | |\ \ \ \ \
| | | * | | | | fix mistranslated messagesMyeongjin2013-11-16
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #425 from dokuwiki-translate/lang_update_487Anika Henke2013-11-16
| | |\ \ \ \ \
| | | * | | | | translation updateMyeongjin2013-11-16
| | | |/ / / /
| | * | | | | Merge pull request #424 from dokuwiki-translate/lang_update_485Anika Henke2013-11-16
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | translation updateMartin Michalek2013-11-14
| | | |/ / /
| * | | | | Merge branch 'lang_update_464' of github.com:dokuwiki-translate/dokuwiki into...Anika Henke2013-11-16
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | translation updateJonas Gröger2013-11-12
| | |/ / /
| * | | | Merge pull request #422 from glensc/patch-1Andreas Gohr2013-11-13
| |\ \ \ \
| | * | | | media_isexternal do not captureElan Ruusamäe2013-11-13
| * | | | | Merge pull request #423 from glensc/no-infosAndreas Gohr2013-11-13
| |\ \ \ \ \ | | |/ / / / | |/| | | |