summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* event HTML_SHOWREV_OUTPUTghi2015-02-17
* Merge https://github.com/splitbrain/dokuwiki into html_showrev_outputghi2015-02-17
|\
| * Merge pull request #1043 from Dr-Yukon/patch-1Andreas Gohr2015-02-16
| |\
| | * Update template.phpRainbow Spike2015-02-16
| |/
| * Merge pull request #1032 from chang-zhao/patch-1Andreas Gohr2015-02-16
| |\
| | * Update wordblock.confchang-zhao2015-02-13
| | * Update wordblock.confchang-zhao2015-02-12
| | * Update wordblock.confchang-zhao2015-02-12
| * | Merge pull request #1035 from dokuwiki-translate/lang_update_2Andreas Gohr2015-02-13
| |\ \
| | * | translation updateÁlvaro Iradier2015-02-13
| |/ /
| * | Merge pull request #497 from mprins/semantic_you_are_hereAndreas Gohr2015-02-12
| |\ \
| | * | use nav+ul element for "you are here"Mark2014-12-18
| * | | Merge pull request #1033 from Tim222/patch-1Andreas Gohr2015-02-12
| |\ \ \ | | |_|/ | |/| |
| | * | Added icon for interwiki.confTim2222015-02-12
| | * | Update interwiki.confTim2222015-02-12
| |/ /
| * | Merge pull request #1031 from dokuwiki-translate/lang_update_1Andreas Gohr2015-02-12
| |\ \
| | * | translation updatelainme2015-02-12
| |/ /
| * | Merge pull request #872 from splitbrain/bug863Andreas Gohr2015-02-11
| |\ \
| | * | Send CRLF to Windows UAs for code blocks #863Andreas Gohr2014-09-27
| * | | Merge pull request #1028 from glensc/exit-1Andreas Gohr2015-02-11
| |\ \ \
| | * | | consistency: failure exit with status code 1Elan Ruusamäe2015-02-10
| |/ / /
| * | | Merge pull request #1013 from dokuwiki-translate/lang_update_168Andreas Gohr2015-02-09
| |\ \ \
| | * | | translation updateAleksandr Selivanov2015-01-25
| * | | | fix username handling in dwpage CLI tool. closes #1019Andreas Gohr2015-02-09
| * | | | fix referral settings in AuthLDAP. closes #1023Andreas Gohr2015-02-09
| * | | | fixed method signature #1024Andreas Gohr2015-02-09
| * | | | Fix farm config cascade for extendable user style and scripts #954Michael Hamann2015-02-01
| * | | | Merge pull request #1015 from dokuwiki-translate/lang_update_176Andreas Gohr2015-01-28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | translation updateDavor Turkalj2015-01-28
| |/ / /
| * | | Merge pull request #1010 from maliktunga/masterAndreas Gohr2015-01-19
| |\ \ \
| | * | | "Login" and "Logout" become "Log In" and "Log Out"Gilles-Philippe Morin2015-01-18
| |/ / /
| * | | Merge pull request #1005 from maliktunga/masterAndreas Gohr2015-01-15
| |\ \ \
| | * | | "Recent changes" becomes "Recent Changes"Gilles-Philippe Morin2015-01-13
| * | | | fixed wrong config check in extension manager #1006Andreas Gohr2015-01-15
| * | | | Merge pull request #1007 from KeenRivals/masterAndreas Gohr2015-01-14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Losslessly reduced PNG images with optipng -o7 -strip all, advdef -z4 -i60, a...KeenRivals2015-01-14
| |/ / /
| * | | Merge pull request #1001 from Dr-Yukon/patch-1Andreas Gohr2015-01-12
| |\ \ \
| | * | | Update css.phpRainbow Spike2015-01-12
| |/ / /
| * | | Merge pull request #1000 from splitbrain/scrutinizer-patch-1Andreas Gohr2015-01-10
| |\ \ \
| | * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-01-10
| |/ / /
| * | | Merge pull request #999 from BCLibCoop/masterAndreas Gohr2015-01-10
| |\ \ \
| | * | | Clean up RSS sort wording per https://github.com/splitbrain/dokuwiki/pull/999...Robin H. Johnson2015-01-09
| | * | | Document the nosort parameter.Robin H. Johnson2015-01-08
| * | | | Merge pull request #998 from dokuwiki-translate/lang_update_159Andreas Gohr2015-01-08
| |\ \ \ \
| | * | | | translation updateMijndert2015-01-08
| |/ / / /
| * | | | Merge pull request #927 from cstuder/ctrlenter2submitAndreas Gohr2015-01-08
| |\ \ \ \
| | * | | | Handles CTRL-Enter event to save in the editorchristian studer2014-11-12
| * | | | | Merge pull request #982 from gamma/css.phpAndreas Gohr2015-01-08
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into new_css.phpGerry Weißbach2014-12-22
| | |\ \ \ \ \
| | * | | | | | Additionally allow more media typesGerry Weißbach2014-09-12