summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * | Remove stray comment blockMichael Große2014-12-18
| | |
| * | Fix file sizeMichael Große2014-12-18
| | |
| * | Add test for internal video filesMichael Große2014-12-18
| | |
| * | Add tests: known and unknown external video filesMichael Große2014-11-27
| | |
* | | Merge pull request #969 from dokuwiki-translate/lang_update_114Andreas Gohr2014-12-17
|\ \ \ | | | | | | | | Translation update (ja)
| * | | translation updateSatoshi Sahara2014-12-17
|/ / /
* | | never exit during test runsAndreas Gohr2014-12-17
| | |
* | | fix global environment during test requestsAndreas Gohr2014-12-17
| | |
* | | Merge pull request #968 from dokuwiki-translate/lang_update_109Andreas Gohr2014-12-16
|\ \ \ | | | | | | | | Translation update (ru)
| * | | translation updateVitaly Filatenko2014-12-15
|/ / /
* | | Merge pull request #964 from dokuwiki-translate/lang_update_94Andreas Gohr2014-12-15
|\ \ \ | | | | | | | | Translation update (cs)
| * | | translation updateJaroslav Lichtblau2014-12-13
| | | |
* | | | Merge pull request #965 from dokuwiki-translate/lang_update_98Andreas Gohr2014-12-15
|\ \ \ \ | | | | | | | | | | Translation update (ru)
| * | | | translation updateType-kun2014-12-13
| |/ / /
* | | | Merge pull request #966 from dokuwiki-translate/lang_update_100Andreas Gohr2014-12-15
|\ \ \ \ | |/ / / |/| | | Translation update (ko)
| * | | translation updateMyeongjin2014-12-14
|/ / /
* | | Merge pull request #963 from dokuwiki-translate/lang_update_91Andreas Gohr2014-12-12
|\ \ \ | | | | | | | | Translation update (ru)
| * | | translation updateType-kun2014-12-12
|/ / /
* | | Merge pull request #957 from dokuwiki-translate/lang_update_83Andreas Gohr2014-12-12
|\ \ \ | | | | | | | | Translation update (ja)
| * | | translation updateSatoshi Sahara2014-12-12
| | | |
* | | | Merge pull request #960 from dokuwiki-translate/lang_update_88Andreas Gohr2014-12-12
|\ \ \ \ | | | | | | | | | | Translation update (fi)
| * | | | translation updateJussi Takala2014-12-12
| |/ / /
* | | | Merge pull request #959 from dokuwiki-translate/lang_update_87Andreas Gohr2014-12-12
|\ \ \ \ | | | | | | | | | | Translation update (fi)
| * | | | translation updateJussi Takala2014-12-12
| |/ / /