summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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.
| * | | | | Optionally render RSS unsorted.Robin H. Johnson2015-01-07
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, SimplePie sorts RSS entries by the the date on each entry. If some cases, mostly where RSS is used as a input format for another service, rendering the order as-is is better than having it sorted. This patch adds a new parameter for the rss keyword, 'nosort', which can be used to disable SimplePie's sorting. This makes it possible to correctly display RSS feeds from "Remember The Milk", which have a complex order from the system. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
* | | | | Merge pull request #995 from splitbrain/scrutinizer-patch-1Andreas Gohr2015-01-07
|\ \ \ \ \ | | | | | | | | | | | | Scrutinizer Auto-Fixes
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-01-07
|/ / / / / | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | fixed search'and'replace fuckup in config pluginAndreas Gohr2015-01-07
| | | | |
* | | | | Remove IE6 workaround for redirects with hashesAndreas Gohr2015-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer support IE6, so hashes in URLs no longer need to be protected when redirecting.
* | | | | Remove error supression for file_exists()Andreas Gohr2015-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an older version of PHP a file_exists() call would issue a warning when the file did not exist. This was fixed in later PHP releases. Since we require PHP 5.3 now, there's no need to supress any error here anymore. This might even give a minor performance boost.
* | | | | Merge pull request #994 from dokuwiki-translate/lang_update_148Andreas Gohr2015-01-06
|\ \ \ \ \ | | | | | | | | | | | | Translation update (fr)
| * | | | | translation updateSchplurtz le Déboulonné2015-01-05
|/ / / / /
* | | | | Merge pull request #989 from dokuwiki-translate/lang_update_136Andreas Gohr2015-01-05
|\ \ \ \ \ | | | | | | | | | | | | Translation update (cs)
| * | | | | translation updateJaroslav Lichtblau2014-12-31
| |/ / / /
* | | | | Merge pull request #993 from dokuwiki-translate/lang_update_140Andreas Gohr2015-01-05
|\ \ \ \ \ | |/ / / / |/| | | | Translation update (pl)
| * | | | translation updateMaciej Helt2015-01-05
|/ / / /
* | | | Merge pull request #987 from dokuwiki-translate/lang_update_135Andreas Gohr2014-12-30
|\ \ \ \ | | | | | | | | | | Translation update (ro)
| * | | | translation updateMarian Banica2014-12-30
|/ / / /
* | | | Merge pull request #975 from dokuwiki-translate/lang_update_122Andreas Gohr2014-12-27
|\ \ \ \ | | | | | | | | | | Translation update (pt)
| * | | | translation updateGuido Salatino2014-12-18
| | | | |
* | | | | Merge pull request #979 from dokuwiki-translate/lang_update_129Andreas Gohr2014-12-27
|\ \ \ \ \ | | | | | | | | | | | | Translation update (fr)
| * | | | | translation updateYves Grandvalet2014-12-20
| |/ / / /
* | | | | Merge pull request #981 from dokuwiki-translate/lang_update_130Andreas Gohr2014-12-22
|\ \ \ \ \ | | | | | | | | | | | | Translation update (ru)
| * | | | | translation updateType-kun2014-12-21
| |/ / / /
* | | | | Merge pull request #845 from gamma/masterAndreas Gohr2014-12-22
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | rfc2231 compatible encoding for header()
| * | | Merge remote-tracking branch 'splitbrain/master'Gerry Weißbach2014-12-22
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #973 from micgro42/videoTestAndreas Gohr2014-12-18
|\ \ \ | | | | | | | | Add tests for video syntax
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 23:03:48 +0000