[commits] Horde branch master updated. 3cc71485f98f7ba5e641087938f16fcda933a7d5

[Michael M Slusarz]

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

from: 4808be058bc07af3f936f3576aecf958f41beac2

c9647ba [mms] Fix accessing dynamic compose page when file uploads are not available (Bug #13580).
a3745c5 No need to observe these if uploading files is not available
3cc7148 [mms] Fix some folder display issues when not using IMAP subscriptions in dynamic view (Bug #13553).

Summary: http://github.com/horde/horde/compare/4808be058bc07af3f936f3576aecf958f41beac2...3cc71485f98f7ba5e641087938f16fcda933a7d5

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

commit c9647ba7bbfd5b09e003b4ab96292f740e961eeb
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 23 10:59:34 2014 -0600

    [mms] Fix accessing dynamic compose page when file uploads are not available (Bug #13580).

 imp/docs/CHANGES       |    2 ++
 imp/js/compose-dimp.js |    8 +++++---
 imp/package.xml        |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/c9647ba7bbfd5b09e003b4ab96292f740e961eeb

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

commit a3745c5f024e3a066d87c217e2cb0c1d6bab0085
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 23 11:07:57 2014 -0600

    No need to observe these if uploading files is not available

 imp/js/compose-dimp.js |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/a3745c5f024e3a066d87c217e2cb0c1d6bab0085

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

commit 3cc71485f98f7ba5e641087938f16fcda933a7d5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 23 12:53:07 2014 -0600

    [mms] Fix some folder display issues when not using IMAP subscriptions in dynamic view (Bug #13553).
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/js/dimpbase.js
    	imp/package.xml

 imp/docs/CHANGES            |    2 ++
 imp/js/dimpbase.js          |   17 +++++++++++------
 imp/lib/Dynamic/Mailbox.php |    6 ++++--
 imp/package.xml             |    1 +
 4 files changed, 18 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/3cc71485f98f7ba5e641087938f16fcda933a7d5