The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: d6b64567a2a42f722b042bd63024919f8f7c95ec 797bb8c [mms] Fix edit links for virtual folders in dynamic view. 4646277 [mms] Fix APPENDs on remote IMAP servers that do not support CATENATE. fb507e2 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 797bb8c24b99fafb49e7cead033ab18107f2b711 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 14:58:55 2013 -0700 [mms] Fix edit links for virtual folders in dynamic view. [mms] Fix links to virtual folders on search preferences page. imp/docs/CHANGES | 2 ++ imp/js/dimpbase.js | 13 +++++++++---- imp/js/searchesprefs.js | 3 --- imp/lib/Prefs/Special/Searches.php | 18 ++++-------------- imp/package.xml | 4 ++++ imp/templates/prefs/searches.html.php | 4 ---- imp/themes/default/screen.css | 5 ----- 7 files changed, 19 insertions(+), 30 deletions(-) http://git.horde.org/horde-git/-/commit/797bb8c24b99fafb49e7cead033ab18107f2b711 ----------------------------------------------------------------------- commit 4646277ac241a99ab7954e1040da34b5f2e0fdec Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 17:31:38 2013 -0700 [mms] Fix APPENDs on remote IMAP servers that do not support CATENATE. framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 10 ++++++---- framework/Imap_Client/package.xml | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/4646277ac241a99ab7954e1040da34b5f2e0fdec ----------------------------------------------------------------------- commit fb507e28f9a7aee3b87eccdbfa0ec96cea7f9533 Merge: d6b6456 4646277 Author: Michael M Slusarz <[email protected]> Date: Sun Feb 24 17:34:28 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/docs/CHANGES imp/lib/Prefs/Special/Searches.php imp/package.xml framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 10 +++++--- framework/Imap_Client/package.xml | 2 + imp/docs/CHANGES | 2 + imp/js/dimpbase.js | 13 ++++++++--- imp/js/searchesprefs.js | 3 -- imp/lib/Prefs/Special/Searches.php | 18 +++------------ imp/package.xml | 2 + imp/templates/prefs/searches.html.php | 4 --- imp/themes/default/screen.css | 5 ---- 9 files changed, 25 insertions(+), 34 deletions(-) http://git.horde.org/horde-git/-/commit/fb507e28f9a7aee3b87eccdbfa0ec96cea7f9533 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
