Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Update css.php | Rainbow Spike | 2015-01-12 |
| | | | 1 little fix | ||
* | Merge pull request #1000 from splitbrain/scrutinizer-patch-1 | Andreas Gohr | 2015-01-10 |
|\ | | | | | Scrutinizer Auto-Fixes | ||
| * | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-01-10 |
|/ | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||
* | Merge pull request #999 from BCLibCoop/master | Andreas Gohr | 2015-01-10 |
|\ | | | | | Document the nosort parameter. | ||
| * | Clean up RSS sort wording per ↵ | Robin H. Johnson | 2015-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. Johnson | 2015-01-08 |
| | | | | | | | | Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> | ||
* | | Merge pull request #998 from dokuwiki-translate/lang_update_159 | Andreas Gohr | 2015-01-08 |
|\ \ | | | | | | | Translation update (nl) | ||
| * | | translation update | Mijndert | 2015-01-08 |
|/ / | |||
* | | Merge pull request #927 from cstuder/ctrlenter2submit | Andreas Gohr | 2015-01-08 |
|\ \ | | | | | | | Handles CTRL-Enter event to save in the editor | ||
| * | | Handles CTRL-Enter event to save in the editor | christian studer | 2014-11-12 |
| | | | |||
* | | | Merge pull request #982 from gamma/css.php | Andreas Gohr | 2015-01-08 |
|\ \ \ | | | | | | | | | Allow arbitrary mediatype names for CSS | ||
| * \ \ | Merge branch 'master' into new_css.php | Gerry Weißbach | 2014-12-22 |
| |\ \ \ | |||
| * | | | | Additionally allow more media types | Gerry Weißbach | 2014-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 Gohr | 2015-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 64bit | Yurii Korotia | 2015-01-03 |
| | | | | | | |||
* | | | | | | Merge pull request #997 from BCLibCoop/master | Andreas Gohr | 2015-01-08 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | Optionally render RSS unsorted. | ||
| * | | | | | Optionally render RSS unsorted. | Robin H. Johnson | 2015-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-1 | Andreas Gohr | 2015-01-07 |
|\ \ \ \ \ | | | | | | | | | | | | | Scrutinizer Auto-Fixes | ||
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-01-07 |
|/ / / / / | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||
* | | | | | fixed search'and'replace fuckup in config plugin | Andreas Gohr | 2015-01-07 |
| | | | | | |||
* | | | | | Remove IE6 workaround for redirects with hashes | Andreas Gohr | 2015-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 Gohr | 2015-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_148 | Andreas Gohr | 2015-01-06 |
|\ \ \ \ \ | | | | | | | | | | | | | Translation update (fr) | ||
| * | | | | | translation update | Schplurtz le Déboulonné | 2015-01-05 |
|/ / / / / | |||
* | | | | | Merge pull request #989 from dokuwiki-translate/lang_update_136 | Andreas Gohr | 2015-01-05 |
|\ \ \ \ \ | | | | | | | | | | | | | Translation update (cs) | ||
| * | | | | | translation update | Jaroslav Lichtblau | 2014-12-31 |
| |/ / / / | |||
* | | | | | Merge pull request #993 from dokuwiki-translate/lang_update_140 | Andreas Gohr | 2015-01-05 |
|\ \ \ \ \ | |/ / / / |/| | | | | Translation update (pl) | ||
| * | | | | translation update | Maciej Helt | 2015-01-05 |
|/ / / / | |||
* | | | | Merge pull request #987 from dokuwiki-translate/lang_update_135 | Andreas Gohr | 2014-12-30 |
|\ \ \ \ | | | | | | | | | | | Translation update (ro) | ||
| * | | | | translation update | Marian Banica | 2014-12-30 |
|/ / / / | |||
* | | | | Merge pull request #975 from dokuwiki-translate/lang_update_122 | Andreas Gohr | 2014-12-27 |
|\ \ \ \ | | | | | | | | | | | Translation update (pt) | ||
| * | | | | translation update | Guido Salatino | 2014-12-18 |
| | | | | | |||
* | | | | | Merge pull request #979 from dokuwiki-translate/lang_update_129 | Andreas Gohr | 2014-12-27 |
|\ \ \ \ \ | | | | | | | | | | | | | Translation update (fr) | ||
| * | | | | | translation update | Yves Grandvalet | 2014-12-20 |
| |/ / / / | |||
* | | | | | Merge pull request #981 from dokuwiki-translate/lang_update_130 | Andreas Gohr | 2014-12-22 |
|\ \ \ \ \ | | | | | | | | | | | | | Translation update (ru) | ||
| * | | | | | translation update | Type-kun | 2014-12-21 |
| |/ / / / | |||
* | | | | | Merge pull request #845 from gamma/master | Andreas Gohr | 2014-12-22 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | rfc2231 compatible encoding for header() | ||
| * | | | Merge remote-tracking branch 'splitbrain/master' | Gerry Weißbach | 2014-12-22 |
| |\ \ \ | |/ / / |/| / / | |/ / | |||
* | | | Merge pull request #973 from micgro42/videoTest | Andreas Gohr | 2014-12-18 |
|\ \ \ | | | | | | | | | Add tests for video syntax | ||
| * | | | Remove stray comment block | Michael Große | 2014-12-18 |
| | | | | |||
| * | | | Fix file size | Michael Große | 2014-12-18 |
| | | | | |||
| * | | | Add test for internal video files | Michael Große | 2014-12-18 |
| | | | | |||
| * | | | Add tests: known and unknown external video files | Michael Große | 2014-11-27 |
| | |/ | |/| | |||
* | | | Merge pull request #969 from dokuwiki-translate/lang_update_114 | Andreas Gohr | 2014-12-17 |
|\ \ \ | | | | | | | | | Translation update (ja) | ||
| * | | | translation update | Satoshi Sahara | 2014-12-17 |
|/ / / | |||
* | | | never exit during test runs | Andreas Gohr | 2014-12-17 |
| | | | |||
* | | | fix global environment during test requests | Andreas Gohr | 2014-12-17 |
| | | | |||
* | | | Merge pull request #968 from dokuwiki-translate/lang_update_109 | Andreas Gohr | 2014-12-16 |
|\ \ \ | | | | | | | | | Translation update (ru) | ||
| * | | | translation update | Vitaly Filatenko | 2014-12-15 |
|/ / / | |||
* | | | Merge pull request #964 from dokuwiki-translate/lang_update_94 | Andreas Gohr | 2014-12-15 |
|\ \ \ | | | | | | | | | Translation update (cs) |