summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Update template.phpRainbow Spike2015-02-16
| | | Added placeholder in search textarea
* Merge pull request #1032 from chang-zhao/patch-1Andreas Gohr2015-02-16
|\ | | | | Update wordblock.conf
| * Update wordblock.confchang-zhao2015-02-13
| | | | | | moved those keywords to http & added penis
| * Update wordblock.confchang-zhao2015-02-12
| |
| * Update wordblock.confchang-zhao2015-02-12
| | | | | | wordblock.conf too restrictive #1021 - removed fetish, bi...sex & gay...sex
* | Merge pull request #1035 from dokuwiki-translate/lang_update_2Andreas Gohr2015-02-13
|\ \ | | | | | | Translation update (es)
| * | 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" as recommended by W3C spec
| * | use nav+ul element for "you are here"Mark2014-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in the common idioms of the HTML5 spec, mark up navigation as a list inside a `nav` element for better semantics and accessibility. see: * http://www.w3.org/html/wg/drafts/html/master/common-idioms.html#rel-up * http://lists.w3.org/Archives/Public/public-html/2013Nov/thread.html#msg6 * https://dl.dropboxusercontent.com/u/377471/breadcrumb.html for discussion and background.
* | | Merge pull request #1033 from Tim222/patch-1Andreas Gohr2015-02-12
|\ \ \ | |_|/ |/| | Update interwiki.conf
| * | Added icon for interwiki.confTim2222015-02-12
| | | | | | | | | | | | Support for the URI scheme tel: #643
| * | Update interwiki.confTim2222015-02-12
|/ / | | | | Support for the URI scheme tel: #643
* | Merge pull request #1031 from dokuwiki-translate/lang_update_1Andreas Gohr2015-02-12
|\ \ | | | | | | Translation update (zh)
| * | translation updatelainme2015-02-12
|/ /
* | Merge pull request #872 from splitbrain/bug863Andreas Gohr2015-02-11
|\ \ | | | | | | Send CRLF to Windows UAs for code blocks #863
| * | 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 1
| * | | 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 update (ru)
| * | | 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 update (hr)
| * | | translation updateDavor Turkalj2015-01-28
|/ / /
* | | Merge pull request #1010 from maliktunga/masterAndreas Gohr2015-01-19
|\ \ \ | | | | | | | | "Login" and "Logout" become "Log In" and "Log Out"
| * | | "Login" and "Logout" become "Log In" and "Log Out"Gilles-Philippe Morin2015-01-18
|/ / / | | | | | | This change improves consistency with neighboring links such as "Update Profile" and "Register", which are two action verbs. "Login" and "Logout" were nouns and not verbs. Title case capitalization is applied because of "Update Profile".
* | | Merge pull request #1005 from maliktunga/masterAndreas Gohr2015-01-15
|\ \ \ | | | | | | | | "Recent changes" becomes "Recent Changes"
| * | | "Recent changes" becomes "Recent Changes"Gilles-Philippe Morin2015-01-13
| | | | | | | | | | | | To improve consistency: it is surrounded by "Update Profile" and "Media Manager".
* | | | 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 & advdef
| * | | Losslessly reduced PNG images with optipng -o7 -strip all, advdef -z4 -i60, ↵KeenRivals2015-01-14
|/ / / | | | | | | | | | and advpng -z4 -i60.
* | | Merge pull request #1001 from Dr-Yukon/patch-1Andreas Gohr2015-01-12
|\ \ \ | | | | | | | | Update css.php
| * | | Update css.phpRainbow Spike2015-01-12
|/ / / | | | | | | 1 little fix
* | | Merge pull request #1000 from splitbrain/scrutinizer-patch-1Andreas Gohr2015-01-10
|\ \ \ | | | | | | | | Scrutinizer Auto-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-01-10
|/ / / | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | Merge pull request #999 from BCLibCoop/masterAndreas Gohr2015-01-10
|\ \ \ | | | | | | | | Document the nosort parameter.
| * | | Clean up RSS sort wording per ↵Robin H. Johnson2015-01-09
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/splitbrain/dokuwiki/pull/999#discussion_r22706527. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| * | | Document the nosort parameter.Robin H. Johnson2015-01-08
| | | | | | | | | | | | | | | | Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
* | | | Merge pull request #998 from dokuwiki-translate/lang_update_159Andreas Gohr2015-01-08
|\ \ \ \ | | | | | | | | | | Translation update (nl)
| * | | | translation updateMijndert2015-01-08
|/ / / /
* | | | Merge pull request #927 from cstuder/ctrlenter2submitAndreas Gohr2015-01-08
|\ \ \ \ | | | | | | | | | | Handles CTRL-Enter event to save in the editor
| * | | | Handles CTRL-Enter event to save in the editorchristian studer2014-11-12
| | | | |
* | | | | Merge pull request #982 from gamma/css.phpAndreas Gohr2015-01-08
|\ \ \ \ \ | | | | | | | | | | | | Allow arbitrary mediatype names for CSS
| * \ \ \ \ Merge branch 'master' into new_css.phpGerry Weißbach2014-12-22
| |\ \ \ \ \
| * | | | | | Additionally allow more media typesGerry Weißbach2014-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are generated from the default ones and any additional one given by the template. This allows to e.g. split admin styles from end user styles in a closed wiki. You can then deliver only the user styles using the metaheaders plugin.
* | | | | | | Merge branch 'master' of https://github.com/yurii-github/dokuwiki into ↵Andreas Gohr2015-01-08
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yurii-github-master * 'master' of https://github.com/yurii-github/dokuwiki: fixes FASTCGI_UNEXPECTED_EXIT (error 0xff) in FastCGI/IIS for PHP5.6.x 64bit Conflicts: inc/plugincontroller.class.php
| * | | | | | | fixes FASTCGI_UNEXPECTED_EXIT (error 0xff) in FastCGI/IIS for PHP5.6.x 64bitYurii Korotia2015-01-03
| | | | | | | |
* | | | | | | | Merge pull request #997 from BCLibCoop/masterAndreas Gohr2015-01-08
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Optionally render RSS unsorted.