The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 699adba4e043b9a325a721d164c64b31f39497cb 66c00ea Use new button instead of generic menu entry e037ccc Add menu icons to stylesheet b7314eb Use new searchfield in topbar for ticket id search. 2bb7365 Add function for topbar search a1dfde4 Accidentally replaced function 5c7afbf Change theming of search bar in menu 2a62e0c [mms] Fix display of mail log icons on the basic message page (Bug #11964). 6ec12c3 Allow text selection on subject/message contents in dynamic message view (Bug #11786) 3224975 Allow text selection of other headers in dynamic view (Bug #11786) 577d347 Fix Horde_Share: test fails (Bug #11966) c61f075 Remove unused variable (Bug #11968). eaee6be Add license file (Bug #11967). 0b69ddd Merge branch 'master' of https://github.com/KarimG94/horde ff1c527 [jan] Fix JavaScript errors with Internet Explorer 8 (Bug #11940). 12e254c Add optional tidy extension to Text_Filter's package.xml 57509e4 Fix resetting quota class in dynamic view d099b37 Missing echo() command 9074e21 Bug #11969: Fix undefined variable warning e414f77 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 66c00ea10b91b4cbe3b1aded281957461d184ac3 Author: Karim Geiger <[email protected]> Date: Tue Jan 15 10:56:09 2013 +0100 Use new button instead of generic menu entry whups/lib/Application.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/66c00ea10b91b4cbe3b1aded281957461d184ac3 ----------------------------------------------------------------------- commit e037cccfd81ab6be9c938b4cb11bd5599245be40 Author: Karim Geiger <[email protected]> Date: Tue Jan 15 11:07:23 2013 +0100 Add menu icons to stylesheet whups/lib/Application.php | 10 +++++----- whups/themes/default/screen.css | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/e037cccfd81ab6be9c938b4cb11bd5599245be40 ----------------------------------------------------------------------- commit b7314eb4263c340ae0949cc077b1b518b641238f Author: Karim Geiger <[email protected]> Date: Tue Jan 15 12:03:42 2013 +0100 Use new searchfield in topbar for ticket id search. whups/admin/index.php | 6 ++++++ whups/lib/Whups.php | 7 +++++-- whups/mybugs.php | 5 +++++ whups/mybugs_edit.php | 6 ++++++ whups/query/index.php | 5 +++++ whups/query/run.php | 6 ++++++ whups/reports.php | 6 ++++++ whups/search.php | 5 +++++ whups/templates/menu.inc | 7 ------- whups/ticket/comment.php | 6 ++++++ whups/ticket/create.php | 6 ++++++ whups/ticket/delete.php | 5 +++++ whups/ticket/index.php | 11 ++++++++++- whups/ticket/queue.php | 5 +++++ whups/ticket/type.php | 5 +++++ whups/ticket/update.php | 5 +++++ whups/ticket/watch.php | 5 +++++ 17 files changed, 91 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/b7314eb4263c340ae0949cc077b1b518b641238f ----------------------------------------------------------------------- commit 2bb73658b1d6267ce15f503887caf070f531b7d4 Author: Karim Geiger <[email protected]> Date: Tue Jan 15 13:34:55 2013 +0100 Add function for topbar search whups/admin/index.php | 6 +----- whups/lib/Whups.php | 12 +++++++++++- whups/mybugs.php | 7 ++----- whups/mybugs_edit.php | 6 +----- whups/query/index.php | 7 ++----- whups/query/run.php | 6 +----- whups/reports.php | 6 +----- whups/search.php | 9 +++------ whups/ticket/comment.php | 6 +----- whups/ticket/create.php | 6 +----- whups/ticket/delete.php | 7 ++----- whups/ticket/index.php | 6 +----- whups/ticket/queue.php | 7 ++----- whups/ticket/type.php | 7 ++----- whups/ticket/update.php | 7 ++----- whups/ticket/watch.php | 7 ++----- 16 files changed, 35 insertions(+), 77 deletions(-) http://git.horde.org/horde-git/-/commit/2bb73658b1d6267ce15f503887caf070f531b7d4 ----------------------------------------------------------------------- commit a1dfde496e8ce5b12dbe38e0bb8a23779c1ef75a Author: Karim Geiger <[email protected]> Date: Tue Jan 15 13:39:00 2013 +0100 Accidentally replaced function whups/search.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/a1dfde496e8ce5b12dbe38e0bb8a23779c1ef75a ----------------------------------------------------------------------- commit 5c7afbf4cc0c444bbe8b251d17dea30434098740 Author: Karim Geiger <[email protected]> Date: Tue Jan 15 15:27:30 2013 +0100 Change theming of search bar in menu whups/lib/Application.php | 2 +- whups/themes/default/screen.css | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/5c7afbf4cc0c444bbe8b251d17dea30434098740 ----------------------------------------------------------------------- commit 2a62e0c2cdb0e43c0afb25df26872a71ea5578ab Author: Michael M Slusarz <[email protected]> Date: Tue Jan 15 20:31:18 2013 -0700 [mms] Fix display of mail log icons on the basic message page (Bug #11964). imp/docs/CHANGES | 1 + imp/lib/Notification/Event/Status.php | 6 +++--- imp/package.xml | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/2a62e0c2cdb0e43c0afb25df26872a71ea5578ab ----------------------------------------------------------------------- commit 6ec12c3ccdf99d95f64ce5591d43ff7bc754cc38 Author: Michael M Slusarz <[email protected]> Date: Tue Jan 15 22:18:11 2013 -0700 Allow text selection on subject/message contents in dynamic message view (Bug #11786) imp/templates/dynamic/message.html.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/6ec12c3ccdf99d95f64ce5591d43ff7bc754cc38 ----------------------------------------------------------------------- commit 32249751c6668b3ab941ad90004439cb2d0bc271 Author: Michael M Slusarz <[email protected]> Date: Tue Jan 15 22:23:25 2013 -0700 Allow text selection of other headers in dynamic view (Bug #11786) imp/templates/dynamic/mailbox.html.php | 12 ++++++------ imp/templates/dynamic/message.html.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/32249751c6668b3ab941ad90004439cb2d0bc271 ----------------------------------------------------------------------- commit 577d3475ecc1d574a150cb8d59b626c37afea47d Author: Remi Collet <[email protected]> Date: Wed Jan 16 08:50:19 2013 +0100 Fix Horde_Share: test fails (Bug #11966) Rename Horde_Share_Test_Base::callback() to callbackSetShareOb() Avoid name conflict with PHPUnit_Framework_Assert::callback() Signed-off-by: Jan Schneider <[email protected]> framework/Share/test/Horde/Share/Base.php | 2 +- framework/Share/test/Horde/Share/Kolab/MockTest.php | 4 ++-- framework/Share/test/Horde/Share/Sql/Base.php | 2 +- framework/Share/test/Horde/Share/Sqlng/Base.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/577d3475ecc1d574a150cb8d59b626c37afea47d ----------------------------------------------------------------------- commit c61f075bdaa226b778738acf623ce922625ac55e Author: Jan Schneider <[email protected]> Date: Wed Jan 16 10:50:42 2013 +0100 Remove unused variable (Bug #11968). turba/lib/Driver/Share.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/c61f075bdaa226b778738acf623ce922625ac55e ----------------------------------------------------------------------- commit eaee6bea1a3c4aa509fdb1652a6d5ac4d76c2172 Author: Jan Schneider <[email protected]> Date: Wed Jan 16 10:54:08 2013 +0100 Add license file (Bug #11967). framework/Timezone/doc/Horde/Timezone/COPYING | 458 +++++++++++++++++++++++++ framework/Timezone/package.xml | 18 +- 2 files changed, 471 insertions(+), 5 deletions(-) create mode 100644 framework/Timezone/doc/Horde/Timezone/COPYING http://git.horde.org/horde-git/-/commit/eaee6bea1a3c4aa509fdb1652a6d5ac4d76c2172 ----------------------------------------------------------------------- commit 0b69dddf1912309369ec492286a2a54ee968ad36 Merge: eaee6be 5c7afbf Author: Jan Schneider <[email protected]> Date: Wed Jan 16 11:02:56 2013 +0100 Merge branch 'master' of https://github.com/KarimG94/horde whups/admin/index.php | 2 ++ whups/lib/Application.php | 18 ++++++++++++------ whups/lib/Whups.php | 17 +++++++++++++++-- whups/mybugs.php | 2 ++ whups/mybugs_edit.php | 2 ++ whups/query/index.php | 2 ++ whups/query/run.php | 2 ++ whups/reports.php | 2 ++ whups/search.php | 2 ++ whups/templates/menu.inc | 7 ------- whups/themes/default/screen.css | 14 ++++++++++++++ whups/ticket/comment.php | 2 ++ whups/ticket/create.php | 2 ++ whups/ticket/delete.php | 2 ++ whups/ticket/index.php | 7 ++++++- whups/ticket/queue.php | 2 ++ whups/ticket/type.php | 2 ++ whups/ticket/update.php | 2 ++ whups/ticket/watch.php | 2 ++ 19 files changed, 75 insertions(+), 16 deletions(-) http://git.horde.org/horde-git/-/commit/0b69dddf1912309369ec492286a2a54ee968ad36 ----------------------------------------------------------------------- commit ff1c527b33de2cbda55c957c964951b37389b550 Author: Jan Schneider <[email protected]> Date: Wed Jan 16 14:04:35 2013 +0100 [jan] Fix JavaScript errors with Internet Explorer 8 (Bug #11940). imp/docs/CHANGES | 1 + imp/js/dimpbase.js | 6 ++++++ imp/js/mailbox.js | 4 ++-- imp/mailbox.php | 2 +- imp/package.xml | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/ff1c527b33de2cbda55c957c964951b37389b550 ----------------------------------------------------------------------- commit 12e254c29ae689f15ef3ea852ac92302f37bd7f6 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 11:31:05 2013 -0700 Add optional tidy extension to Text_Filter's package.xml framework/Text_Filter/package.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/12e254c29ae689f15ef3ea852ac92302f37bd7f6 ----------------------------------------------------------------------- commit 57509e46eebdc36f54d907be3fc7b4e27184efe3 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 11:42:43 2013 -0700 Fix resetting quota class in dynamic view imp/js/dimpbase.js | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/57509e46eebdc36f54d907be3fc7b4e27184efe3 ----------------------------------------------------------------------- commit d099b3763cc7638ce3315c8482c2cf7c89110639 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 12:03:07 2013 -0700 Missing echo() command imp/templates/basic/mailbox/navbar.html.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/d099b3763cc7638ce3315c8482c2cf7c89110639 ----------------------------------------------------------------------- commit 9074e216ac7ea418cbaff20e68304cc1a842508a Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 12:08:40 2013 -0700 Bug #11969: Fix undefined variable warning imp/lib/Dynamic/Compose.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/9074e216ac7ea418cbaff20e68304cc1a842508a ----------------------------------------------------------------------- commit e414f771ae91b9a1b0d2b02c289b12fe6b63260e Merge: 699adba 9074e21 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 13:33:17 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/docs/CHANGES imp/package.xml framework/Share/test/Horde/Share/Base.php | 2 +- framework/Share/test/Horde/Share/Kolab/MockTest.php | 4 +- framework/Share/test/Horde/Share/Sql/Base.php | 2 +- framework/Share/test/Horde/Share/Sqlng/Base.php | 2 +- framework/Text_Filter/package.xml | 3 + framework/Timezone/doc/Horde/Timezone/COPYING | 458 +++++++++++++++++++ framework/Timezone/package.xml | 18 +- imp/docs/CHANGES | 2 + imp/js/dimpbase.js | 21 +- imp/js/mailbox.js | 4 +- imp/lib/Dynamic/Compose.php | 4 +- imp/lib/Notification/Event/Status.php | 6 +- imp/mailbox.php | 2 +- imp/package.xml | 2 + imp/templates/basic/mailbox/navbar.html.php | 2 +- imp/templates/dynamic/mailbox.html.php | 12 +- imp/templates/dynamic/message.html.php | 6 +- turba/lib/Driver/Share.php | 2 +- whups/admin/index.php | 2 + whups/lib/Application.php | 18 +- whups/lib/Whups.php | 17 +- whups/mybugs.php | 2 + whups/mybugs_edit.php | 2 + whups/query/index.php | 2 + whups/query/run.php | 2 + whups/reports.php | 2 + whups/search.php | 2 + whups/templates/menu.inc | 7 - whups/themes/default/screen.css | 14 + whups/ticket/comment.php | 2 + whups/ticket/create.php | 2 + whups/ticket/delete.php | 2 + whups/ticket/index.php | 7 +- whups/ticket/queue.php | 2 + whups/ticket/type.php | 2 + whups/ticket/update.php | 2 + whups/ticket/watch.php | 2 + 37 files changed, 589 insertions(+), 54 deletions(-) http://git.horde.org/horde-git/-/commit/e414f771ae91b9a1b0d2b02c289b12fe6b63260e -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
