[commits] Horde branch develop updated. 06c432782db257a8c8f14d412de76082729ff7b8

[Michael M Slusarz]

The branch "develop" has been updated.
The following is a summary of the commits.

from: 51bf4315f49f8ce4b5df63ae475abc915d7265d0

03c56a4 [mms] Allow multiple date searches to be specified in a single AND search query.
e1a5c21 Switching search field during quicksearch needs to be atomic
16f88b7 No longer needed - expand/collapse is done in AJAX code
5f6ba19 [mms] Fix expand/collapse of folder tree in mobile view.
4179322 Update imp's package.xml with new file
06c4327 Merge branch 'master' into develop

-----------------------------------------------------------------------

commit 03c56a4d96ea6461c927f508b66b878209100fbe
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 00:57:39 2012 -0700

    [mms] Allow multiple date searches to be specified in a single AND search query.

 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php |   17 ++++-----
 framework/Imap_Client/package.xml                            |    2 +
 2 files changed, 10 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/03c56a4d96ea6461c927f508b66b878209100fbe

-----------------------------------------------------------------------

commit e1a5c21a11f4f488ab9d3a4684591f6e5946c0e2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 13:00:50 2012 -0700

    Switching search field during quicksearch needs to be atomic

 imp/js/dimpbase.js             |    8 ++++++--
 imp/lib/Ajax/Application.php   |   25 +++++++++++--------------
 imp/lib/Views/ListMessages.php |   12 +++++++-----
 3 files changed, 24 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/e1a5c21a11f4f488ab9d3a4684591f6e5946c0e2

-----------------------------------------------------------------------

commit 16f88b79004114350339be699a0f9a45689b5830
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 16:00:45 2012 -0700

    No longer needed - expand/collapse is done in AJAX code

 imp/folders.php |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/16f88b79004114350339be699a0f9a45689b5830

-----------------------------------------------------------------------

commit 5f6ba19a1afb3506960ebbeda36b167fd5d522cd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 16:17:51 2012 -0700

    [mms] Fix expand/collapse of folder tree in mobile view.

 imp/docs/CHANGES            |    1 +
 imp/folders-mimp.php        |    2 +-
 imp/lib/Imap/Tree.php       |   21 +++++++++++++++------
 imp/lib/Tree/Simplehtml.php |   30 ++++++++++++++++++++++++++++++
 imp/package.xml             |    2 ++
 5 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 imp/lib/Tree/Simplehtml.php

http://git.horde.org/horde-git/-/commit/5f6ba19a1afb3506960ebbeda36b167fd5d522cd

-----------------------------------------------------------------------

commit 41793225097fc408bbf5567deef8a31f28210ba9
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 16:18:47 2012 -0700

    Update imp's package.xml with new file

 imp/package.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/41793225097fc408bbf5567deef8a31f28210ba9

-----------------------------------------------------------------------

commit 06c432782db257a8c8f14d412de76082729ff7b8
Merge: 51bf431 4179322
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jan 13 17:20:14 2012 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/js/dimpbase.js
    	imp/lib/Ajax/Application.php
    	imp/lib/Views/ListMessages.php
    	imp/package.xml

 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php |   17 +++---
 framework/Imap_Client/package.xml                            |    2 +
 imp/docs/CHANGES                                             |    1 +
 imp/folders-mimp.php                                         |    2 +-
 imp/folders.php                                              |    7 --
 imp/lib/Ajax/Application.php                                 |   26 ++++-----
 imp/lib/Imap/Tree.php                                        |   21 +++++--
 imp/lib/Tree/Simplehtml.php                                  |   30 ++++++++++
 imp/lib/Views/ListMessages.php                               |    4 +-
 imp/package.xml                                              |    9 ++-
 10 files changed, 76 insertions(+), 43 deletions(-)

http://git.horde.org/horde-git/-/commit/06c432782db257a8c8f14d412de76082729ff7b8