[commits] Horde branch imp_6_1 updated. 9b900eb212db6b5a1678347c9e4be04c269b39ed

[Michael M Slusarz]

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

from: 2cc8207e381eae3b0ac145e6a9b7d55d9b387aff

f2e5b00 Don't hide save attachments if ONLY link_attachments is true, since a user can choose to not link attachments on a given message.
1323860 Always use autodetection when viewing compose attachment data
678ed3f Fix smartmobile view in IE 8 (Bug #11970)
07d7571 Jquery creation HTML must be well-formed
9b900eb Merge branch 'master' into imp_6_1

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

commit f2e5b007ab5b3eac5c90f1abca469be6236ed43d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 15:47:27 2013 -0700

    Don't hide save attachments if ONLY link_attachments is true, since a user can choose to not link attachments on a given message.

 imp/compose.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 13238603356b3d4159ffb9bf2e286eb111b475d1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 20:15:31 2013 -0700

    Always use autodetection when viewing compose attachment data

 imp/view.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/13238603356b3d4159ffb9bf2e286eb111b475d1

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

commit 678ed3fa17a57b2699bba3c988cf99f621175d64
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 21:15:36 2013 -0700

    Fix smartmobile view in IE 8 (Bug #11970)

 imp/js/smartmobile.js |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/678ed3fa17a57b2699bba3c988cf99f621175d64

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

commit 07d757111442f10322977cce8689584933b1c27e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 21:18:53 2013 -0700

    Jquery creation HTML must be well-formed

 framework/Core/js/growler-jquery.js                     |    2 +-
 framework/Core/js/jquery.mobile/plugins/autocomplete.js |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/07d757111442f10322977cce8689584933b1c27e

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

commit 9b900eb212db6b5a1678347c9e4be04c269b39ed
Merge: 2cc8207 07d7571
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jan 16 21:23:29 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/compose.php
    	imp/js/smartmobile.js

 framework/Core/js/growler-jquery.js                     |    2 +-
 framework/Core/js/jquery.mobile/plugins/autocomplete.js |    4 +-
 imp/js/smartmobile.js                                   |   18 +++++++-------
 imp/view.php                                            |    4 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/9b900eb212db6b5a1678347c9e4be04c269b39ed