Good Morning! This are the git changes for DokuWiki committed yesterday. Please test them and report bugs. --------------------------------------------------------------------- http://github.com/splitbrain/dokuwiki/commit/c9f847f625f0f4094fe46392a06e4f4169f7d44c Merge: 70f8c49 1e5105f Author: Andreas Gohr <andi[at]splitbrain.org> Date: Sat Mar 10 16:24:48 2012 +0100 Merge branch 'adexpirywarn' * adexpirywarn: make sure AD pass expiry message is never shown twice do not hardcode profile link in AD pass expire message translatable AD expiry warning and link to update profile page Don't return any data for non-existant users do not query AD for empty user name always check expire time when configured Check password expiry times in Active Directory backend http://github.com/splitbrain/dokuwiki/commit/70f8c497b285679b9e4450e496b717ccc409af03 Merge: 9189204 20f0403 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Sat Mar 10 07:19:39 2012 -0800 Merge pull request #71 from danny0838/master Rework for 2 missing commits http://github.com/splitbrain/dokuwiki/commit/9189204ab4405b5698d7a4f13131a7a2d6e9d2fe Merge: 50fbf1b e67004f Author: Andreas Gohr <andi[at]splitbrain.org> Date: Sat Mar 10 15:55:05 2012 +0100 Merge branch 'jscachekey' * jscachekey: trigger JS_CACHE_USE in lib/exe/js.php added INIT_LANG_LOAD event let js.php use multiple caches http://github.com/splitbrain/dokuwiki/commit/50fbf1b6522a235e93ba72c50d0f54e09506604a Merge: 7980e1a 8a9735e Author: Andreas Gohr <andi[at]splitbrain.org> Date: Sat Mar 10 15:47:05 2012 +0100 Merge branch 'resetpassword' No longer autogenerate passwords for password reset when $conf['autopasswd'] is disabled. Instead allow to change the password online. * resetpassword: added a timelimit for password reset tokens removed commented line use correct lang string for password mismatch removed outdated language string. it has to be retranslated German translation for password reset honor autopasswd setting for resend password Conflicts: inc/lang/no/lang.php inc/lang/sl/lang.php http://github.com/splitbrain/dokuwiki/commit/20f04039e631c2cfd34d22e124d2b9d9b94a19d6 Author: Danny <danny0838[at]hotmail.com> Date: Thu Mar 1 20:54:28 2012 +0800 Fix a stupid typo http://github.com/splitbrain/dokuwiki/commit/8a9735e34dc99c24355e0aee74a3cd49aa3b1492 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Sun Feb 19 13:38:31 2012 +0100 added a timelimit for password reset tokens passwords now need to be reset within 3 days of requesting the password change mail http://github.com/splitbrain/dokuwiki/commit/4d3ea096062ffd40303a0499aee5b7f757e00948 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Fri Feb 17 21:48:02 2012 +0100 removed commented line http://github.com/splitbrain/dokuwiki/commit/451e1b4dc1985d10b3aeaeeaf23d5498ce87032b Author: Andreas Gohr <andi[at]splitbrain.org> Date: Fri Feb 17 14:10:10 2012 +0100 use correct lang string for password mismatch http://github.com/splitbrain/dokuwiki/commit/7cb9c0e3233fdc295a05e410a1d7a731301bc2da Author: Andreas Gohr <andi[at]splitbrain.org> Date: Fri Feb 17 14:06:34 2012 +0100 removed outdated language string. it has to be retranslated http://github.com/splitbrain/dokuwiki/commit/1e5105f90f56d0f57111eff37a535480115920c5 Author: Andreas Gohr <andi[at]splitbrain.org> Date: Fri Feb 17 13:42:39 2012 +0100 make sure AD pass expiry message is never shown twice http://github.com/splitbrain/dokuwiki/commit/69995a164f9dbb51adfe17f09901e0200ea8dc7a Author: Andreas Gohr <andi[at]splitbrain.org> Date: Fri Feb 17 13:39:38 2012 +0100 do not hardcode profile link in AD pass expire message Changing passwords might not be available. http://github.com/splitbrain/dokuwiki/commit/e67004f5b686076af0dbf00cf574ac643d003cae Author: Andreas Gohr <andi[at]splitbrain.org> Date: Tue Feb 7 19:41:09 2012 +0100 trigger JS_CACHE_USE in lib/exe/js.php This removes the cachekey parameter again and instead follows [at]michitux's suggestion to trigger an event for the cache usage http://github.com/splitbrain/dokuwiki/commit/6d06b26afab712379b6d070a816f0c71cc76753b Author: Dominik Eckelmann <eckelmann[at]cosmocode.de> Date: Tue Jan 24 14:30:34 2012 +0100 added INIT_LANG_LOAD event http://github.com/splitbrain/dokuwiki/commit/c51f90d7a072929e2b636e986b8ea2121bc5a630 Author: Dominik Eckelmann <eckelmann[at]cosmocode.de> Date: Tue Jan 24 11:12:44 2012 +0100 let js.php use multiple caches http://github.com/splitbrain/dokuwiki/commit/f01b3e16cda640fb4b47ec254b8390970da0b806 Author: Danny <danny0838[at]gmail.com> Date: Sat Dec 17 13:32:44 2011 +0800 Slight fix to match current version. http://github.com/splitbrain/dokuwiki/commit/85038eabd994f3b7609fee54bfbaab2513f28c1e Author: Danny <danny0838[at]gmail.com> Date: Sat Dec 17 13:18:12 2011 +0800 Rework for missing commit 08162f005f3ced0555de590dc1a53155af99d998 http://github.com/splitbrain/dokuwiki/commit/fb838798781d6a7a488c82a93c69853bb5cb08d8 Author: Danny <danny0838[at]gmail.com> Date: Sat Dec 17 13:17:44 2011 +0800 Rewark for missing commit 9aa0e6c6087e616511fc95d1650ca9b608edece8 http://github.com/splitbrain/dokuwiki/commit/95fbd79bc40a02aa5fdf80a55e8f2c77e5ae71f2 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Nov 7 15:16:36 2011 +0100 German translation for password reset http://github.com/splitbrain/dokuwiki/commit/b2117c6969fc31aa958f6019fd1e4e258f555db7 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Nov 7 14:49:29 2011 +0100 translatable AD expiry warning and link to update profile page http://github.com/splitbrain/dokuwiki/commit/9565908d97917c579e2ecb44a0b44a133df598fe Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Nov 7 14:36:23 2011 +0100 Don't return any data for non-existant users http://github.com/splitbrain/dokuwiki/commit/7f99c819166c15279a3214e3439be8efb77f7021 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Nov 7 14:31:09 2011 +0100 do not query AD for empty user name http://github.com/splitbrain/dokuwiki/commit/22ffffcf6892924895d9ad45f749a307d05e09e0 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Nov 7 14:15:29 2011 +0100 always check expire time when configured http://github.com/splitbrain/dokuwiki/commit/abb56b33e0993b3c6a7f114fbd074cc59626c394 Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Fri Oct 28 14:24:56 2011 +0200 Check password expiry times in Active Directory backend When a user logs in, the password expiry time is checked and compared to the $conf['auth']['ad']['expirywarn'] setting (in days). If the password is about to expire in the specified timeframe, a warning is issued on login. This patch adds a new method to the adLDAP class for querying domain parameters. http://github.com/splitbrain/dokuwiki/commit/cc204bbd1f1625352ddd0edaacdd297fe022881c Author: Andreas Gohr <gohr[at]cosmocode.de> Date: Mon Oct 31 15:41:53 2011 +0100 honor autopasswd setting for resend password When autopasswd is disabled, the resend password option now asks for a new password instead of autogenerating a new one and sending it by mail. Note to translators: the wording for btn_resendpwd and resendpwd changed to be more universal. English and German language files where updated - other languages need to be adjusted. Conflicts: inc/lang/en/lang.php --------------------------------------------------------------------- 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
