The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: f30969b5d9d5e9bf3b5744349deecea48ec8f72e 7d827ef Don't load topbar if viewing in dynamic view 40eddcf Don't show subscribe actions if IMAP subscriptions are disabled 73a403f More places to alter output depending on value of subscribe 6a02a4c [jan] Fix reading translations in PEAR-installed package. d5624b3 Fix typos (Bug #12760). 7c3340f [jan] Fix exporting selected contacts (Bug #12759). f73446e Update de translation. be815f7 Updated 821a23a [jan] Fix editing tasks via CalDAV (Bug #12745). bfe61b1 [jan] Fix displaying of ticket tabs (Bug #12744). c35e642 Fix regression in Horde_Db_SearchParser::parse(). Fixes #12743 056a1c9 [jan] Always re-throw PDOExceptions as Horde_Db_Exceptions. 3dd26d6 [jan] Fix edge case that allowed to enter start time after end time (Bug #12752). 2dfc534 Re-use the current transaction (Bug #12683). 853ba99 Fix variable name. 041ac8d Move alarm updating to Nag_Driver::modify(). f48d849 [mms] Trigger auto save draft in dynamic view if attachments have changed. 8a28949 Don't change default, but indicate that port 587 is correct and port 25 is incorrect f498947 [mms] Fix populating search fields when editing an advanced search query. b0ebc26 Better fix 80a1071 Merge branch 'master' into imp_6_2 Summary: http://github.com/horde/horde/compare/f30969b5d9d5e9bf3b5744349deecea48ec8f72e...80a1071203e280c7810819e762462461e408fd8e ----------------------------------------------------------------------- commit 7d827ef51eaf9ee57bfee952157a9b08879813a8 Author: Michael M Slusarz <[email protected]> Date: Fri Oct 11 17:15:01 2013 -0600 Don't load topbar if viewing in dynamic view imp/lib/Basic/Search.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/7d827ef51eaf9ee57bfee952157a9b08879813a8 http://git.horde.org/horde-git/-/commit/7d827ef51eaf9ee57bfee952157a9b08879813a8 ----------------------------------------------------------------------- commit 40eddcf8b92cecc32bd69f923cd274e503c3aec9 Author: Michael M Slusarz <[email protected]> Date: Fri Oct 11 18:00:49 2013 -0600 Don't show subscribe actions if IMAP subscriptions are disabled imp/lib/Dynamic/Mailbox.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) http://github.com/horde/horde/commit/40eddcf8b92cecc32bd69f923cd274e503c3aec9 http://git.horde.org/horde-git/-/commit/40eddcf8b92cecc32bd69f923cd274e503c3aec9 ----------------------------------------------------------------------- commit 73a403f1d193f06b86cc73294dcfe988744de61f Author: Michael M Slusarz <[email protected]> Date: Fri Oct 11 18:03:21 2013 -0600 More places to alter output depending on value of subscribe imp/lib/Dynamic/Mailbox.php | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) http://github.com/horde/horde/commit/73a403f1d193f06b86cc73294dcfe988744de61f http://git.horde.org/horde-git/-/commit/73a403f1d193f06b86cc73294dcfe988744de61f ----------------------------------------------------------------------- commit 6a02a4c5b0f5d17e5b91109a6a8b1f16ced7cfad Author: Jan Schneider <[email protected]> Date: Mon Oct 14 13:13:05 2013 +0200 [jan] Fix reading translations in PEAR-installed package. framework/Smtp/package.xml | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/6a02a4c5b0f5d17e5b91109a6a8b1f16ced7cfad http://git.horde.org/horde-git/-/commit/6a02a4c5b0f5d17e5b91109a6a8b1f16ced7cfad ----------------------------------------------------------------------- commit d5624b3b782ef4d77891e482fb99e0a3aefb653e Author: Jan Schneider <[email protected]> Date: Mon Oct 14 14:12:24 2013 +0200 Fix typos (Bug #12760). framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo | Bin 20259 -> 20259 bytes framework/Core/locale/de/LC_MESSAGES/Horde_Core.po | 6 +++--- imp/locale/de/LC_MESSAGES/imp.mo | Bin 184529 -> 184531 bytes imp/locale/de/LC_MESSAGES/imp.po | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) http://github.com/horde/horde/commit/d5624b3b782ef4d77891e482fb99e0a3aefb653e http://git.horde.org/horde-git/-/commit/d5624b3b782ef4d77891e482fb99e0a3aefb653e ----------------------------------------------------------------------- commit 7c3340f56db77bd602fc012b42413227c5e543e4 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 14:22:56 2013 +0200 [jan] Fix exporting selected contacts (Bug #12759). turba/docs/CHANGES | 1 + turba/lib/Application.php | 2 +- turba/package.xml | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/7c3340f56db77bd602fc012b42413227c5e543e4 http://git.horde.org/horde-git/-/commit/7c3340f56db77bd602fc012b42413227c5e543e4 ----------------------------------------------------------------------- commit f73446ef184af53428a1bfb734095bad84ee6675 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 14:38:18 2013 +0200 Update de translation. ansel/locale/de/LC_MESSAGES/ansel.mo | Bin 107152 -> 107152 bytes ansel/locale/de/LC_MESSAGES/ansel.po | 62 +- framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.mo | Bin 1432 -> 1432 bytes framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.po | 36 +- framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.mo | Bin 3373 -> 3373 bytes framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po | 4 +- framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo | Bin 20259 -> 20259 bytes framework/Core/locale/de/LC_MESSAGES/Horde_Core.po | 80 +- framework/Date/locale/de/LC_MESSAGES/Horde_Date.mo | Bin 1126 -> 1126 bytes framework/Date/locale/de/LC_MESSAGES/Horde_Date.po | 14 +- framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo | Bin 7202 -> 7202 bytes framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po | 96 +- hermes/locale/de/LC_MESSAGES/hermes.mo | Bin 82147 -> 82494 bytes hermes/locale/de/LC_MESSAGES/hermes.po | 113 +- horde/locale/de/LC_MESSAGES/horde.mo | Bin 66215 -> 66215 bytes horde/locale/de/LC_MESSAGES/horde.po | 12 +- imp/locale/de/LC_MESSAGES/imp.mo | Bin 184531 -> 184945 bytes imp/locale/de/LC_MESSAGES/imp.po | 656 +++--- ingo/locale/de/LC_MESSAGES/ingo.mo | Bin 85776 -> 85776 bytes ingo/locale/de/LC_MESSAGES/ingo.po | 6 +- kronolith/locale/de/LC_MESSAGES/kronolith.mo | Bin 128131 -> 128131 bytes kronolith/locale/de/LC_MESSAGES/kronolith.po | 104 +- nag/locale/de/LC_MESSAGES/nag.mo | Bin 92459 -> 92459 bytes nag/locale/de/LC_MESSAGES/nag.po | 14 +- turba/locale/de/LC_MESSAGES/turba.mo | Bin 98885 -> 99010 bytes turba/locale/de/LC_MESSAGES/turba.po | 88 +- whups/locale/de/LC_MESSAGES/whups.mo | Bin 108100 -> 108201 bytes whups/locale/de/LC_MESSAGES/whups.po | 138 +- wicked/locale/de/LC_MESSAGES/wicked.mo | Bin 78398 -> 78398 bytes wicked/locale/de/LC_MESSAGES/wicked.po | 56 +- 30 files changed, 769 insertions(+), 710 deletions(-) http://github.com/horde/horde/commit/f73446ef184af53428a1bfb734095bad84ee6675 http://git.horde.org/horde-git/-/commit/f73446ef184af53428a1bfb734095bad84ee6675 ----------------------------------------------------------------------- commit be815f7ff75566af09ff78eedf1fc35cdde69a1a Author: Jan Schneider <[email protected]> Date: Mon Oct 14 14:38:27 2013 +0200 Updated ansel/locale/ansel.pot | 64 +- framework/ActiveSync/locale/Horde_ActiveSync.pot | 36 +- framework/Auth/locale/Horde_Auth.pot | 4 +- framework/Core/locale/Horde_Core.pot | 80 ++-- framework/Date/locale/Horde_Date.pot | 14 +- framework/Imap_Client/locale/Horde_Imap_Client.pot | 96 ++-- framework/Smtp/locale/Horde_Smtp.pot | 14 +- hermes/locale/hermes.pot | 111 +++-- horde/locale/horde.pot | 14 +- imp/locale/imp.pot | 654 ++++++++++---------- ingo/locale/ingo.pot | 8 +- kronolith/locale/kronolith.pot | 106 ++-- nag/locale/nag.pot | 16 +- turba/locale/turba.pot | 84 ++-- whups/locale/whups.pot | 134 +++-- wicked/locale/wicked.pot | 58 +- 16 files changed, 775 insertions(+), 718 deletions(-) http://github.com/horde/horde/commit/be815f7ff75566af09ff78eedf1fc35cdde69a1a http://git.horde.org/horde-git/-/commit/be815f7ff75566af09ff78eedf1fc35cdde69a1a ----------------------------------------------------------------------- commit 821a23a21464de401273719dc60708b3495f60b2 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 14:52:19 2013 +0200 [jan] Fix editing tasks via CalDAV (Bug #12745). nag/docs/CHANGES | 1 + nag/lib/Application.php | 2 +- nag/package.xml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/821a23a21464de401273719dc60708b3495f60b2 http://git.horde.org/horde-git/-/commit/821a23a21464de401273719dc60708b3495f60b2 ----------------------------------------------------------------------- commit bfe61b1f279f97bc531f0e4eeb55d08d0d961e96 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 15:06:47 2013 +0200 [jan] Fix displaying of ticket tabs (Bug #12744). whups/docs/CHANGES | 1 + whups/lib/Whups.php | 2 +- whups/package.xml | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/bfe61b1f279f97bc531f0e4eeb55d08d0d961e96 http://git.horde.org/horde-git/-/commit/bfe61b1f279f97bc531f0e4eeb55d08d0d961e96 ----------------------------------------------------------------------- commit c35e642ed70a90a2c29dbdebc8dd43e166ffa3f7 Author: Thomas Jarosch <[email protected]> Date: Mon Oct 7 15:08:06 2013 +0200 Fix regression in Horde_Db_SearchParser::parse(). Fixes #12743 Introduced by 0bb0b490c81b9ff889055fc0e69f6ef09c9f13ef "Use Horde_String." Signed-off-by: Jan Schneider <[email protected]> framework/Db/lib/Horde/Db/SearchParser.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/c35e642ed70a90a2c29dbdebc8dd43e166ffa3f7 http://git.horde.org/horde-git/-/commit/c35e642ed70a90a2c29dbdebc8dd43e166ffa3f7 ----------------------------------------------------------------------- commit 056a1c975aa0546731ff451a573419b82302f506 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 15:17:28 2013 +0200 [jan] Always re-throw PDOExceptions as Horde_Db_Exceptions. Related to bug #11923. framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 44 ++++++++++++++++++----- framework/Db/package.xml | 2 + 2 files changed, 36 insertions(+), 10 deletions(-) http://github.com/horde/horde/commit/056a1c975aa0546731ff451a573419b82302f506 http://git.horde.org/horde-git/-/commit/056a1c975aa0546731ff451a573419b82302f506 ----------------------------------------------------------------------- commit 3dd26d69cbfd1a5051d40b7c97b3116f1e96a47b Author: Jan Schneider <[email protected]> Date: Mon Oct 14 15:40:02 2013 +0200 [jan] Fix edge case that allowed to enter start time after end time (Bug #12752). kronolith/docs/CHANGES | 2 ++ kronolith/js/kronolith.js | 37 +++++++++++++++++++++---------------- kronolith/package.xml | 2 ++ 3 files changed, 25 insertions(+), 16 deletions(-) http://github.com/horde/horde/commit/3dd26d69cbfd1a5051d40b7c97b3116f1e96a47b http://git.horde.org/horde-git/-/commit/3dd26d69cbfd1a5051d40b7c97b3116f1e96a47b ----------------------------------------------------------------------- commit 2dfc534510d2821c0a32f7688d927764befa05a2 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 17:18:24 2013 +0200 Re-use the current transaction (Bug #12683). whups/docs/CHANGES | 1 + whups/lib/Driver/Sql.php | 3 ++- whups/package.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/2dfc534510d2821c0a32f7688d927764befa05a2 http://git.horde.org/horde-git/-/commit/2dfc534510d2821c0a32f7688d927764befa05a2 ----------------------------------------------------------------------- commit 853ba997111d530ebc46b94f8cd8b5f255973aa8 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 17:56:12 2013 +0200 Fix variable name. nag/lib/CompleteTask.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/853ba997111d530ebc46b94f8cd8b5f255973aa8 http://git.horde.org/horde-git/-/commit/853ba997111d530ebc46b94f8cd8b5f255973aa8 ----------------------------------------------------------------------- commit 041ac8db0cd279f3c5ddae127940c5d5bf7f0fa1 Author: Jan Schneider <[email protected]> Date: Mon Oct 14 17:57:46 2013 +0200 Move alarm updating to Nag_Driver::modify(). If done in Nag_Task::toggleComplete(), it will get overwritten in later Nag_Task::save() calls. Added benefit: this works now correctly from *any* place where we modify the task. nag/docs/CHANGES | 1 + nag/lib/Driver.php | 23 ++++++++++++++++++++++- nag/lib/Task.php | 13 ------------- nag/package.xml | 2 ++ 4 files changed, 25 insertions(+), 14 deletions(-) http://github.com/horde/horde/commit/041ac8db0cd279f3c5ddae127940c5d5bf7f0fa1 http://git.horde.org/horde-git/-/commit/041ac8db0cd279f3c5ddae127940c5d5bf7f0fa1 ----------------------------------------------------------------------- commit f48d84960620794d37acbfe7a8c233f40505d2c4 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 13:45:06 2013 -0600 [mms] Trigger auto save draft in dynamic view if attachments have changed. imp/docs/CHANGES | 1 + imp/js/compose-dimp.js | 47 ++++++++++++++++++++++++++++++++--------------- imp/package.xml | 2 ++ 3 files changed, 35 insertions(+), 15 deletions(-) http://github.com/horde/horde/commit/f48d84960620794d37acbfe7a8c233f40505d2c4 http://git.horde.org/horde-git/-/commit/f48d84960620794d37acbfe7a8c233f40505d2c4 ----------------------------------------------------------------------- commit 8a28949833ada8235da6bb0866c689b0d5d0b2ce Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 14:01:37 2013 -0600 Don't change default, but indicate that port 587 is correct and port 25 is incorrect horde/config/conf.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/8a28949833ada8235da6bb0866c689b0d5d0b2ce http://git.horde.org/horde-git/-/commit/8a28949833ada8235da6bb0866c689b0d5d0b2ce ----------------------------------------------------------------------- commit f49894797d30ffca5cb7766ca823efba38ae867f Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 14:11:18 2013 -0600 [mms] Fix populating search fields when editing an advanced search query. imp/docs/CHANGES | 1 + imp/js/search.js | 8 +++++--- imp/package.xml | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/f49894797d30ffca5cb7766ca823efba38ae867f http://git.horde.org/horde-git/-/commit/f49894797d30ffca5cb7766ca823efba38ae867f ----------------------------------------------------------------------- commit b0ebc26f0f01b778c34df9d69f0c0ce37a2a1337 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 14:14:46 2013 -0600 Better fix imp/js/search.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/b0ebc26f0f01b778c34df9d69f0c0ce37a2a1337 http://git.horde.org/horde-git/-/commit/b0ebc26f0f01b778c34df9d69f0c0ce37a2a1337 ----------------------------------------------------------------------- commit 80a1071203e280c7810819e762462461e408fd8e Merge: f30969b b0ebc26 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 15:23:16 2013 -0600 Merge branch 'master' into imp_6_2 Conflicts: imp/package.xml ansel/locale/ansel.pot | 64 +- ansel/locale/de/LC_MESSAGES/ansel.mo | Bin 107152 -> 107152 bytes ansel/locale/de/LC_MESSAGES/ansel.po | 62 +- framework/ActiveSync/locale/Horde_ActiveSync.pot | 36 +- framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.mo | Bin 1432 -> 1432 bytes framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.po | 36 +- framework/Auth/locale/Horde_Auth.pot | 4 +- framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.mo | Bin 3373 -> 3373 bytes framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po | 4 +- framework/Core/locale/Horde_Core.pot | 80 +- framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo | Bin 20259 -> 20259 bytes framework/Core/locale/de/LC_MESSAGES/Horde_Core.po | 86 +- framework/Date/locale/Horde_Date.pot | 14 +- framework/Date/locale/de/LC_MESSAGES/Horde_Date.mo | Bin 1126 -> 1126 bytes framework/Date/locale/de/LC_MESSAGES/Horde_Date.po | 14 +- framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php | 44 +- framework/Db/lib/Horde/Db/SearchParser.php | 2 +- framework/Db/package.xml | 2 + framework/Imap_Client/locale/Horde_Imap_Client.pot | 96 +- framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo | Bin 7202 -> 7202 bytes framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po | 96 +- framework/Smtp/locale/Horde_Smtp.pot | 14 +- framework/Smtp/package.xml | 8 +- hermes/locale/de/LC_MESSAGES/hermes.mo | Bin 82147 -> 82494 bytes hermes/locale/de/LC_MESSAGES/hermes.po | 113 +- hermes/locale/hermes.pot | 111 +- horde/config/conf.xml | 3 +- horde/locale/de/LC_MESSAGES/horde.mo | Bin 66215 -> 66215 bytes horde/locale/de/LC_MESSAGES/horde.po | 12 +- horde/locale/horde.pot | 14 +- imp/docs/CHANGES | 2 + imp/js/compose-dimp.js | 47 +- imp/js/search.js | 4 +- imp/lib/Basic/Search.php | 6 +- imp/lib/Dynamic/Mailbox.php | 23 +- imp/locale/de/LC_MESSAGES/imp.mo | Bin 184529 -> 184945 bytes imp/locale/de/LC_MESSAGES/imp.po | 660 +++--- imp/locale/imp.pot | 654 +++--- imp/package.xml | 2 + ingo/locale/de/LC_MESSAGES/ingo.mo | Bin 85776 -> 85776 bytes ingo/locale/de/LC_MESSAGES/ingo.po | 6 +- ingo/locale/ingo.pot | 8 +- kronolith/docs/CHANGES | 2 + kronolith/js/kronolith.js | 37 +- kronolith/locale/de/LC_MESSAGES/kronolith.mo | Bin 128131 -> 128131 bytes kronolith/locale/de/LC_MESSAGES/kronolith.po | 104 +- kronolith/locale/kronolith.pot | 106 +- kronolith/package.xml | 2 + nag/docs/CHANGES | 2 + nag/lib/Application.php | 2 +- nag/lib/CompleteTask.php | 2 +- nag/lib/Driver.php | 23 +- nag/lib/Task.php | 13 - nag/locale/de/LC_MESSAGES/nag.mo | Bin 92459 -> 92459 bytes nag/locale/de/LC_MESSAGES/nag.po | 14 +- nag/locale/nag.pot | 16 +- nag/package.xml | 6 +- turba/docs/CHANGES | 1 + turba/lib/Application.php | 2 +- turba/locale/de/LC_MESSAGES/turba.mo | Bin 98885 -> 99010 bytes turba/locale/de/LC_MESSAGES/turba.po | 88 +- turba/locale/turba.pot | 84 +- turba/package.xml | 2 + whups/docs/CHANGES | 2 + whups/lib/Driver/Sql.php | 3 +- whups/lib/Whups.php | 2 +- whups/locale/de/LC_MESSAGES/whups.mo | Bin 108100 -> 108201 bytes whups/locale/de/LC_MESSAGES/whups.po | 138 +- whups/locale/whups.pot | 134 +- whups/package.xml | 4 + wicked/locale/de/LC_MESSAGES/wicked.mo | Bin 78398 -> 78398 bytes wicked/locale/de/LC_MESSAGES/wicked.po | 56 +- wicked/locale/wicked.pot | 58 +- 73 files changed, 1722 insertions(+), 1508 deletions(-) http://github.com/horde/horde/commit/80a1071203e280c7810819e762462461e408fd8e http://git.horde.org/horde-git/-/commit/80a1071203e280c7810819e762462461e408fd8e -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
