Good Morning! This are the git changes for DokuWiki committed yesterday. Please test them and report bugs. --------------------------------------------------------------------- http://github.com/splitbrain/dokuwiki/commit/16595259b65a9126e7ce3f73e065f62cacf74a72 Merge: 9ecd868 c85bb99 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Thu Jan 8 16:22:51 2015 +0100 Merge pull request #998 from dokuwiki-translate/lang_update_159 Translation update (nl) http://github.com/splitbrain/dokuwiki/commit/c85bb997ff7d1af302b93348c38ad4b2b2914290 Author: Mijndert <mijndert[at]mijndertstuij.nl> Date: Thu Jan 8 16:11:16 2015 +0100 translation update http://github.com/splitbrain/dokuwiki/commit/9ecd86800ad1bca5158e00a1cf42f7d212d7a269 Merge: 32e9be2 52ec63b Author: Andreas Gohr <andi[at]splitbrain.org> Date: Thu Jan 8 12:11:43 2015 +0100 Merge pull request #927 from cstuder/ctrlenter2submit Handles CTRL-Enter event to save in the editor http://github.com/splitbrain/dokuwiki/commit/32e9be23a7c06ab5c4515e1f72809c67da2e9441 Merge: f25cd16 fc30ac3 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Thu Jan 8 12:06:46 2015 +0100 Merge pull request #982 from gamma/css.php Allow arbitrary mediatype names for CSS http://github.com/splitbrain/dokuwiki/commit/f25cd1636fcec40f99f368d9dfb61c0812ed575c Merge: 508170c e8b8a40 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Thu Jan 8 12:04:50 2015 +0100 Merge branch 'master' of https://github.com/yurii-github/dokuwiki into 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 http://github.com/splitbrain/dokuwiki/commit/508170cfb7b7722025748f9a3778cd8cf34fc64e Merge: 8552954 38c6f60 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Thu Jan 8 11:52:56 2015 +0100 Merge pull request #997 from BCLibCoop/master Optionally render RSS unsorted. http://github.com/splitbrain/dokuwiki/commit/38c6f603e006f27fd6194d1d2c14d3087d0e0cc9 Author: Robin H. Johnson <robbat2[at]gentoo.org> Date: Wed Jan 7 21:53:22 2015 -0800 Optionally render RSS unsorted. 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[at]gentoo.org> http://github.com/splitbrain/dokuwiki/commit/e8b8a4027e0150f75db5ab381b7fee4ed959ea2f Author: Yurii Korotia <y.korotia[at]hotmail.com> Date: Sat Jan 3 13:28:56 2015 +0200 fixes FASTCGI_UNEXPECTED_EXIT (error 0xff) in FastCGI/IIS for PHP5.6.x 64bit http://github.com/splitbrain/dokuwiki/commit/fc30ac3acbd4e17e25955ccdd0c5539ee2c9beca Merge: de4634e 8da2ebf Author: Gerry WeiÃbach <gerry.w[at]gammaproduction.de> Date: Mon Dec 22 10:40:15 2014 +0100 Merge branch 'master' into new_css.php http://github.com/splitbrain/dokuwiki/commit/52ec63bf12e618947c2ee9f558db04932d0a1ae4 Author: christian studer <christian.studer[at]meteotest.ch> Date: Wed Nov 12 12:25:47 2014 +0100 Handles CTRL-Enter event to save in the editor http://github.com/splitbrain/dokuwiki/commit/de4634ec87b1a277c1686990d993dafc43db05ed Author: Gerry WeiÃbach <gerry.w[at]gammaproduction.de> Date: Fri Sep 12 08:41:57 2014 +0200 Additionally allow more media types 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. --------------------------------------------------------------------- You can download individual diffs or patches by appending .diff or .patch to the given commit URLs above. Bye, your git changelog mailer -- DokuWiki mailing list - more info at http://www.dokuwiki.org/mailinglist