Good Morning! This are the git changes for DokuWiki committed yesterday. Please test them and report bugs. --------------------------------------------------------------------- http://github.com/splitbrain/dokuwiki/commit/9a1c1c52f3c70d6f48bdfc5d0c2cb88b61672088 Merge: 313fdae f755f63 Author: Michael Hamann <michael[at]content-space.de> Date: Sun Apr 21 12:58:46 2013 -0700 Merge pull request #211 from splitbrain/nonwikidiffs Fix double encoding of html diff output in syndicated feeds and subscrition emails http://github.com/splitbrain/dokuwiki/commit/313fdae7cd442f7ea3dedf764ee0cfd40e482fd9 Merge: f64d0e3 2de592c Author: Michael Hamann <michael[at]content-space.de> Date: Sun Apr 21 12:55:28 2013 -0700 Merge pull request #213 from lupo49/master de/de-informal language updates for several components. http://github.com/splitbrain/dokuwiki/commit/f64d0e32f724871127f9e0a379356f7e7ecf43ef Merge: 8e06db6 1b228d2 Author: Michael Hamann <michael[at]content-space.de> Date: Sun Apr 21 12:49:36 2013 -0700 Merge pull request #214 from splitbrain/authadfixes Rename ad_usernamepassword to admin_username/password http://github.com/splitbrain/dokuwiki/commit/2de592cb4bbca69698b25fb0b11f0f73df46e395 Author: lupo49 <dokuwiki[at]lupo49.de> Date: Sun Apr 21 21:42:58 2013 +0200 de/de-informal: Change "Vorlage" to "Template" http://github.com/splitbrain/dokuwiki/commit/bb7b8a518eac7d3c3dc2b465600047bd10b3f82a Author: lupo49 <dokuwiki[at]lupo49.de> Date: Sun Apr 21 21:39:06 2013 +0200 de/de-informal: Re-add TOC suffixes (Will be removed after the release again) http://github.com/splitbrain/dokuwiki/commit/4c1219f3b8d93b4dd5d55b4246cd44bb5828fbc9 Author: Mateng Schimmerlos <mateng[at]firemail.de> Date: Sun Apr 21 21:31:49 2013 +0200 de/de-informal: Re-apply the updates of ba09710ad34bb383ae3526e84490a3d545f78866 http://github.com/splitbrain/dokuwiki/commit/1b228d28eda480cd189c68eadd1172c9409c6ef7 Author: Klap-in <klapinklapin[at]gmail.com> Date: Sun Apr 21 21:24:33 2013 +0200 Rename ad_username to admin_username canDo getUsers to false when unavailable http://github.com/splitbrain/dokuwiki/commit/bba10e63fd89accbcf180b64adbd26e32ffb1810 Author: lupo49 <dokuwiki[at]lupo49.de> Date: Sun Apr 21 21:24:28 2013 +0200 Revert "German language update" This reverts commit ba09710ad34bb383ae3526e84490a3d545f78866. Conflicts: lib/plugins/authad/lang/de/settings.php http://github.com/splitbrain/dokuwiki/commit/f755f63a3beef948a8d179c0e0860041f4f86db5 Author: Christopher Smith <chris[at]jalakai.co.uk> Date: Wed Apr 10 18:42:20 2013 +0100 FS#2748, fix double encoding of html entities in subscription email diffs (updates subscription.php for changes to Diff class introduced in PR#179) http://github.com/splitbrain/dokuwiki/commit/a494ed3306f1a5e6082a1ffb7e17925a524ea711 Author: Christopher Smith <chris[at]jalakai.co.uk> Date: Wed Apr 10 18:36:35 2013 +0100 FS#2738, fix double encoding of html entities in RSS feeds (updates feed.php for changes to Diff class introduced in PR#179) http://github.com/splitbrain/dokuwiki/commit/df9752e9c1bfd3eaff132b15817baa1c6e989506 Author: Christopher Smith <chris[at]jalakai.co.uk> Date: Wed Apr 10 18:01:04 2013 +0100 add comment to Unified Diff Formatter making it clear the output is unsafe for use in HTML as is --------------------------------------------------------------------- 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