The branch "develop" has been updated. The following is a summary of the commits.
from: ca4496f125556f9c222dada397188d5f45a2f5c1 11974cb Close resources when done. d4ed0ce Make headers more visible in flag management view f438845 Bug #11059: Yet more botched merge fixes. 19dc8d4 Close resources when done. eeb4a88 Make headers more visible in flag management view fece081 Fix selecting folders page entry if that is the current preference value 00db992 Merge branch 'master' into develop b079894 Fix folder/mailbox usage f1566f5 IMP API changes ff83508 Merge branch 'develop_local' into develop ----------------------------------------------------------------------- commit 11974cb98ca94af32e7580790df18f1f051f46b7 Author: Michael J Rubinsky <[email protected]> Date: Wed Mar 7 10:34:13 2012 -0500 Close resources when done. framework/Vcs/lib/Horde/Vcs/QuickLog/Git.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/11974cb98ca94af32e7580790df18f1f051f46b7 ----------------------------------------------------------------------- commit d4ed0cebd6cbe97b7c8f0c8762dd28733580170e Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 11:03:31 2012 -0700 Make headers more visible in flag management view imp/themes/default/screen.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/d4ed0cebd6cbe97b7c8f0c8762dd28733580170e ----------------------------------------------------------------------- commit f438845b7cdc8863579e27584ee642aec6e53d16 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 13:31:12 2012 -0700 Bug #11059: Yet more botched merge fixes. imp/lib/Compose.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/f438845b7cdc8863579e27584ee642aec6e53d16 ----------------------------------------------------------------------- commit 19dc8d4a0114e245503c2f06bc54c102b49f3855 Author: Michael J Rubinsky <[email protected]> Date: Wed Mar 7 10:34:13 2012 -0500 Close resources when done. framework/Vcs/lib/Horde/Vcs/QuickLog/Git.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/19dc8d4a0114e245503c2f06bc54c102b49f3855 ----------------------------------------------------------------------- commit eeb4a88726808b59904587506654c7604a696e70 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 11:03:31 2012 -0700 Make headers more visible in flag management view imp/themes/default/screen.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/eeb4a88726808b59904587506654c7604a696e70 ----------------------------------------------------------------------- commit fece081c81c23dda3d5be4fb4bd854c37245725a Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 16:19:46 2012 -0700 Fix selecting folders page entry if that is the current preference value imp/templates/prefs/initialpage.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/fece081c81c23dda3d5be4fb4bd854c37245725a ----------------------------------------------------------------------- commit 00db9924edb374830779bbbecb3374c8898400f7 Merge: ca4496f fece081 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 16:30:38 2012 -0700 Merge branch 'master' into develop Conflicts: imp/lib/Compose.php framework/Vcs/lib/Horde/Vcs/QuickLog/Git.php | 4 ++++ imp/templates/prefs/initialpage.html | 2 +- imp/themes/default/screen.css | 4 ++++ 3 files changed, 9 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/00db9924edb374830779bbbecb3374c8898400f7 ----------------------------------------------------------------------- commit b079894d03604d44f4cce648d25b08c0c04cd49a Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 16:33:26 2012 -0700 Fix folder/mailbox usage Folders = collection of mailboxes. Example: you don't subscribe to a folder - you subscribe to a mailbox. Keep subfolders usage - this is clearer to me than submailboxes (once you start talking about the child of a mailbox, this implies there is a collection of mailboxes anyway). I've been trying to clean this up over the last few years, but a new major version is the appropriate place to do these big changes. For now, keep the old preference names (e.g. sent_mail_folder) for ease in upgrading. imp/README | 2 +- imp/compose-mimp.php | 8 +- imp/compose.php | 46 ++-- imp/config/prefs.php | 72 +++--- imp/docs/INSTALL | 2 +- imp/docs/UPGRADING | 6 +- imp/folders-mimp.php | 10 +- imp/folders.php | 122 +++++----- imp/js/acl.js | 4 +- imp/js/compose-dimp.js | 14 +- imp/js/compose.js | 16 +- imp/js/dimpbase.js | 298 ++++++++++---------- imp/js/folderprefs.js | 40 ++-- imp/js/folders.js | 45 ++-- imp/js/imp.js | 18 +- imp/js/mailbox.js | 12 +- imp/js/message.js | 12 +- imp/js/mobile.js | 4 +- imp/js/search.js | 112 ++++---- imp/lib/Ajax.php | 10 +- imp/lib/Ajax/Application.php | 18 +- imp/lib/Api.php | 18 +- imp/lib/Application.php | 20 +- imp/lib/Block/Summary.php | 10 +- imp/lib/Compose.php | 28 +- imp/lib/IMP.php | 10 +- imp/lib/Imap.php | 6 +- imp/lib/Imap/Acl.php | 8 +- imp/lib/Imap/Tree.php | 75 +++--- imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php | 38 ++-- imp/lib/LoginTasks/Task/PurgeSentmail.php | 25 +- imp/lib/LoginTasks/Task/PurgeSpam.php | 19 +- imp/lib/LoginTasks/Task/PurgeTrash.php | 18 +- imp/lib/LoginTasks/Task/RenameSentmailMonthly.php | 4 +- imp/lib/Mailbox.php | 10 +- imp/lib/Message.php | 29 +- imp/lib/Prefs/Identity.php | 11 +- imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/lib/Prefs/Ui.php | 124 +++++----- imp/lib/Tree/Flist.php | 11 +- imp/lib/Tree/Jquerymobile.php | 2 +- imp/lib/Ui/Compose.php | 12 +- imp/lib/Ui/Folder.php | 20 +- imp/lib/Ui/Search.php | 12 +- imp/lib/Views/Compose.php | 8 +- imp/mailbox.php | 16 +- imp/message-dimp.php | 11 +- imp/message.php | 6 +- imp/mobile.php | 2 +- imp/search.php | 32 ++-- imp/templates/dimp/compose/compose.html | 4 +- imp/templates/dimp/index.inc | 74 +++--- imp/templates/imp/compose/compose.html | 10 +- imp/templates/imp/flist/flist.html | 2 +- imp/templates/imp/folders/actions.html | 30 +- imp/templates/imp/folders/folders_confirm.html | 18 +- imp/templates/imp/folders/folders_size.html | 18 +- imp/templates/imp/folders/import.html | 6 +- imp/templates/imp/javascript_defs.php | 20 +- imp/templates/imp/mailbox/searchfolder.html | 3 - imp/templates/imp/mailbox/searchmbox.html | 3 + imp/templates/imp/menu/menu.html | 2 +- imp/templates/imp/message/navbar_navigate.html | 2 +- imp/templates/imp/search/search.html | 12 +- imp/templates/mobile/javascript_defs.php | 2 +- imp/templates/mobile/target.html.php | 2 +- imp/templates/prefs/acl.html | 6 +- imp/templates/prefs/drafts.html | 2 +- imp/templates/prefs/initialpage.html | 6 +- imp/templates/prefs/sentmail.html | 2 +- imp/templates/prefs/spam.html | 2 +- imp/templates/prefs/trash.html | 2 +- imp/themes/default/dimp/ie7.css | 4 +- imp/themes/default/dimp/screen.css | 42 ++-- imp/themes/default/screen.css | 19 +-- imp/themes/silver/dimp/screen.css | 26 +- imp/themes/silver/screen.css | 2 +- 77 files changed, 879 insertions(+), 900 deletions(-) delete mode 100644 imp/templates/imp/mailbox/searchfolder.html create mode 100644 imp/templates/imp/mailbox/searchmbox.html http://git.horde.org/horde-git/-/commit/b079894d03604d44f4cce648d25b08c0c04cd49a ----------------------------------------------------------------------- commit f1566f5f3019fbd07e2f94ea3ba087dac1fdb041 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 16:35:34 2012 -0700 IMP API changes See imp/docs/UPGRADING for list of changes. imp/docs/UPGRADING | 32 ++++++++++++++++++++++ imp/lib/Api.php | 60 +++++++++++++++++++++------------------- ingo/lib/Api.php | 5 +++- ingo/lib/Ingo.php | 16 +++++----- ingo/lib/Script/Imap/Live.php | 23 +++++++++++----- sam/config/attributes.php | 4 +- 6 files changed, 93 insertions(+), 47 deletions(-) http://git.horde.org/horde-git/-/commit/f1566f5f3019fbd07e2f94ea3ba087dac1fdb041 ----------------------------------------------------------------------- commit ff8350869d97ecdf9876e57d427aa046682fe5c9 Merge: 00db992 f1566f5 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 7 18:03:35 2012 -0700 Merge branch 'develop_local' into develop Conflicts: imp/templates/prefs/initialpage.html imp/README | 2 +- imp/compose-mimp.php | 8 +- imp/compose.php | 46 ++-- imp/config/prefs.php | 72 +++--- imp/docs/INSTALL | 2 +- imp/docs/UPGRADING | 38 +++- imp/folders-mimp.php | 10 +- imp/folders.php | 122 +++++----- imp/js/acl.js | 4 +- imp/js/compose-dimp.js | 14 +- imp/js/compose.js | 16 +- imp/js/dimpbase.js | 298 ++++++++++---------- imp/js/folderprefs.js | 40 ++-- imp/js/folders.js | 45 ++-- imp/js/imp.js | 18 +- imp/js/mailbox.js | 12 +- imp/js/message.js | 12 +- imp/js/mobile.js | 4 +- imp/js/search.js | 112 ++++---- imp/lib/Ajax.php | 10 +- imp/lib/Ajax/Application.php | 18 +- imp/lib/Api.php | 70 +++--- imp/lib/Application.php | 20 +- imp/lib/Block/Summary.php | 10 +- imp/lib/Compose.php | 28 +- imp/lib/IMP.php | 10 +- imp/lib/Imap.php | 6 +- imp/lib/Imap/Acl.php | 8 +- imp/lib/Imap/Tree.php | 75 +++--- imp/lib/LoginTasks/Task/DeleteSentmailMonthly.php | 38 ++-- imp/lib/LoginTasks/Task/PurgeSentmail.php | 25 +- imp/lib/LoginTasks/Task/PurgeSpam.php | 19 +- imp/lib/LoginTasks/Task/PurgeTrash.php | 18 +- imp/lib/LoginTasks/Task/RenameSentmailMonthly.php | 4 +- imp/lib/Mailbox.php | 10 +- imp/lib/Message.php | 29 +- imp/lib/Prefs/Identity.php | 11 +- imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/lib/Prefs/Ui.php | 124 +++++----- imp/lib/Tree/Flist.php | 11 +- imp/lib/Tree/Jquerymobile.php | 2 +- imp/lib/Ui/Compose.php | 12 +- imp/lib/Ui/Folder.php | 20 +- imp/lib/Ui/Search.php | 12 +- imp/lib/Views/Compose.php | 8 +- imp/mailbox.php | 16 +- imp/message-dimp.php | 11 +- imp/message.php | 6 +- imp/mobile.php | 2 +- imp/search.php | 32 ++-- imp/templates/dimp/compose/compose.html | 4 +- imp/templates/dimp/index.inc | 74 +++--- imp/templates/imp/compose/compose.html | 10 +- imp/templates/imp/flist/flist.html | 2 +- imp/templates/imp/folders/actions.html | 30 +- imp/templates/imp/folders/folders_confirm.html | 18 +- imp/templates/imp/folders/folders_size.html | 18 +- imp/templates/imp/folders/import.html | 6 +- imp/templates/imp/javascript_defs.php | 20 +- imp/templates/imp/mailbox/searchfolder.html | 3 - imp/templates/imp/mailbox/searchmbox.html | 3 + imp/templates/imp/menu/menu.html | 2 +- imp/templates/imp/message/navbar_navigate.html | 2 +- imp/templates/imp/search/search.html | 12 +- imp/templates/mobile/javascript_defs.php | 2 +- imp/templates/mobile/target.html.php | 2 +- imp/templates/prefs/acl.html | 6 +- imp/templates/prefs/drafts.html | 2 +- imp/templates/prefs/initialpage.html | 6 +- imp/templates/prefs/sentmail.html | 2 +- imp/templates/prefs/spam.html | 2 +- imp/templates/prefs/trash.html | 2 +- imp/themes/default/dimp/ie7.css | 4 +- imp/themes/default/dimp/screen.css | 42 ++-- imp/themes/default/screen.css | 19 +-- imp/themes/silver/dimp/screen.css | 26 +- imp/themes/silver/screen.css | 2 +- ingo/lib/Api.php | 5 +- ingo/lib/Ingo.php | 16 +- ingo/lib/Script/Imap/Live.php | 23 ++- sam/config/attributes.php | 4 +- 81 files changed, 968 insertions(+), 943 deletions(-) http://git.horde.org/horde-git/-/commit/ff8350869d97ecdf9876e57d427aa046682fe5c9 __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
