The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: acd9d4d8c6f5a0f301a39ccae177269e79fb8d81 0d25249 [jan] Don't show admin alarm form if alarms are disabled. 022c49d [mms] Fix iteration of Horde_Prefs_Scope object. b5a5e77 [mms] Add 'tlsv1' as a secure parameter option in the Client constructor. 388a6c0 [mms] Fix prototype.js issue in IE 9 regarding array iteration in a parent window. 255bfc5 Merge branch 'master' into imp_6_2 Summary: http://github.com/horde/horde/compare/acd9d4d8c6f5a0f301a39ccae177269e79fb8d81...255bfc5c865e8122e0f8be95503bb5ed08e435a7 ----------------------------------------------------------------------- commit 0d2524928ef760c3c667c2cd00f63ea85a7f29be Author: Jan Schneider <[email protected]> Date: Thu Oct 24 18:43:58 2013 +0200 [jan] Don't show admin alarm form if alarms are disabled. horde/admin/alarms.php | 45 ++++++++++++++++++++++++++------------------- horde/docs/CHANGES | 1 + horde/package.xml | 2 ++ 3 files changed, 29 insertions(+), 19 deletions(-) http://github.com/horde/horde/commit/0d2524928ef760c3c667c2cd00f63ea85a7f29be http://git.horde.org/horde-git/-/commit/0d2524928ef760c3c667c2cd00f63ea85a7f29be ----------------------------------------------------------------------- commit 022c49d050d1daff8d4ce759af61ccc97d41dad2 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 24 19:48:57 2013 -0600 [mms] Fix iteration of Horde_Prefs_Scope object. framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +- framework/Prefs/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/022c49d050d1daff8d4ce759af61ccc97d41dad2 http://git.horde.org/horde-git/-/commit/022c49d050d1daff8d4ce759af61ccc97d41dad2 ----------------------------------------------------------------------- commit b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b Author: Michael M Slusarz <[email protected]> Date: Thu Oct 24 20:14:08 2013 -0600 [mms] Add 'tlsv1' as a secure parameter option in the Client constructor. framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING | 21 +++++++++++++ framework/Socket_Client/lib/Horde/Socket/Client.php | 14 +++++--- framework/Socket_Client/package.xml | 10 ++++-- 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING http://github.com/horde/horde/commit/b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b http://git.horde.org/horde-git/-/commit/b5a5e77092fce4fbd9b70d9a2f99aaebbf4d2e9b ----------------------------------------------------------------------- commit 388a6c0db3c0b530583fcd3186a694b71f3d07a1 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 24 22:10:10 2013 -0600 [mms] Fix prototype.js issue in IE 9 regarding array iteration in a parent window. Got lost when we upgraded prototype.js. But this is an issue when a window runs code in a parent (the native IE forEach handler does not correctly set the value of 'this' in the called function). framework/Core/js/prototype.js | 2 +- framework/Core/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/388a6c0db3c0b530583fcd3186a694b71f3d07a1 http://git.horde.org/horde-git/-/commit/388a6c0db3c0b530583fcd3186a694b71f3d07a1 ----------------------------------------------------------------------- commit 255bfc5c865e8122e0f8be95503bb5ed08e435a7 Merge: acd9d4d 388a6c0 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 24 22:12:26 2013 -0600 Merge branch 'master' into imp_6_2 framework/Core/js/prototype.js | 2 +- framework/Core/package.xml | 4 +- framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +- framework/Prefs/package.xml | 4 +- framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING | 21 ++++++ framework/Socket_Client/lib/Horde/Socket/Client.php | 14 +++-- framework/Socket_Client/package.xml | 10 ++- horde/admin/alarms.php | 45 +++++++----- horde/docs/CHANGES | 1 + horde/package.xml | 2 + 10 files changed, 71 insertions(+), 34 deletions(-) http://github.com/horde/horde/commit/255bfc5c865e8122e0f8be95503bb5ed08e435a7 http://git.horde.org/horde-git/-/commit/255bfc5c865e8122e0f8be95503bb5ed08e435a7 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
