The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: 80a1071203e280c7810819e762462461e408fd8e 2b3f8d7 This may not exist 5d0b3fc phpdoc 1530ae5 [mms] Add base64img property to Horde_Themes_Image. caff330 [mms] Add Horde_Core_Ui_FlagImage#getFlagImageObByHost. f1806bb Merge branch 'master' into imp_6_2 a0222c5 Refactor contacts image code to allow sender country flags to be implemented within it Summary: http://github.com/horde/horde/compare/80a1071203e280c7810819e762462461e408fd8e...a0222c5d8c56c318b3c460868d1953aca224fc46 ----------------------------------------------------------------------- commit 2b3f8d76d6c6f0fb21406c791ac32abbc224c249 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 15:28:11 2013 -0600 This may not exist imp/js/dimpbase.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/2b3f8d76d6c6f0fb21406c791ac32abbc224c249 http://git.horde.org/horde-git/-/commit/2b3f8d76d6c6f0fb21406c791ac32abbc224c249 ----------------------------------------------------------------------- commit 5d0b3fcd1a2e85ccd88d4b381c78efef1185984c Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 15:36:15 2013 -0600 phpdoc framework/Core/lib/Horde/Core/Ui/FlagImage.php | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) http://github.com/horde/horde/commit/5d0b3fcd1a2e85ccd88d4b381c78efef1185984c http://git.horde.org/horde-git/-/commit/5d0b3fcd1a2e85ccd88d4b381c78efef1185984c ----------------------------------------------------------------------- commit 1530ae54edd4c9e317933fad35d1746b9f07f326 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 15:41:47 2013 -0600 [mms] Add base64img property to Horde_Themes_Image. framework/Core/lib/Horde/Themes/Image.php | 16 ++++++++++++++++ framework/Core/package.xml | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-) http://github.com/horde/horde/commit/1530ae54edd4c9e317933fad35d1746b9f07f326 http://git.horde.org/horde-git/-/commit/1530ae54edd4c9e317933fad35d1746b9f07f326 ----------------------------------------------------------------------- commit caff330f36012829c20b8237b2a5b72655b5b4df Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 15:48:59 2013 -0600 [mms] Add Horde_Core_Ui_FlagImage#getFlagImageObByHost. framework/Core/lib/Horde/Core/Ui/FlagImage.php | 36 ++++++++++++++++++++++-- framework/Core/package.xml | 2 + 2 files changed, 35 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/caff330f36012829c20b8237b2a5b72655b5b4df http://git.horde.org/horde-git/-/commit/caff330f36012829c20b8237b2a5b72655b5b4df ----------------------------------------------------------------------- commit f1806bbe62ed4fb72ae95bc0d5fe1f038c30f1a4 Merge: 2b3f8d7 caff330 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 16:05:14 2013 -0600 Merge branch 'master' into imp_6_2 framework/Core/lib/Horde/Core/Ui/FlagImage.php | 60 ++++++++++++++++++++---- framework/Core/lib/Horde/Themes/Image.php | 16 ++++++ framework/Core/package.xml | 4 ++ 3 files changed, 71 insertions(+), 9 deletions(-) http://github.com/horde/horde/commit/f1806bbe62ed4fb72ae95bc0d5fe1f038c30f1a4 http://git.horde.org/horde-git/-/commit/f1806bbe62ed4fb72ae95bc0d5fe1f038c30f1a4 ----------------------------------------------------------------------- commit a0222c5d8c56c318b3c460868d1953aca224fc46 Author: Michael M Slusarz <[email protected]> Date: Mon Oct 14 16:31:05 2013 -0600 Refactor contacts image code to allow sender country flags to be implemented within it imp/config/conf.xml | 9 ++-- imp/js/dimpcore.js | 11 ++-- imp/lib/Ajax/Application/Handler/Dynamic.php | 22 +++++--- imp/lib/Basic/Message.php | 33 +++++------- imp/lib/Contacts/Avatar/Addressbook.php | 69 ++++++++++++++++++++++++ imp/lib/Contacts/Avatar/Backend.php | 34 ++++++++++++ imp/lib/Contacts/Avatar/Gravatar.php | 56 ++++++++++++++++++++ imp/lib/Contacts/Avatar/Unknown.php | 32 +++++++++++ imp/lib/Contacts/Flag/Backend.php | 34 ++++++++++++ imp/lib/Contacts/Flag/Host.php | 40 ++++++++++++++ imp/lib/Contacts/Image.php | 32 ++++++++++-- imp/lib/Contacts/Image/Addressbook.php | 73 -------------------------- imp/lib/Contacts/Image/Backend.php | 49 ----------------- imp/lib/Contacts/Image/Gravatar.php | 63 ---------------------- imp/lib/Contacts/Image/Unknown.php | 39 -------------- 15 files changed, 329 insertions(+), 267 deletions(-) create mode 100644 imp/lib/Contacts/Avatar/Addressbook.php create mode 100644 imp/lib/Contacts/Avatar/Backend.php create mode 100644 imp/lib/Contacts/Avatar/Gravatar.php create mode 100644 imp/lib/Contacts/Avatar/Unknown.php create mode 100644 imp/lib/Contacts/Flag/Backend.php create mode 100644 imp/lib/Contacts/Flag/Host.php delete mode 100644 imp/lib/Contacts/Image/Addressbook.php delete mode 100644 imp/lib/Contacts/Image/Backend.php delete mode 100644 imp/lib/Contacts/Image/Gravatar.php delete mode 100644 imp/lib/Contacts/Image/Unknown.php http://github.com/horde/horde/commit/a0222c5d8c56c318b3c460868d1953aca224fc46 http://git.horde.org/horde-git/-/commit/a0222c5d8c56c318b3c460868d1953aca224fc46 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
