The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: d0fc65af9715470f4e2bffe8726604ce3a064e1d 585f0ba use https image urls when horde runs in https environment ae9485b Update index.php 1af2057 Fix links 912d96f Revert "Fix links" 5fbbcae Fix links correctly. 0790dbf explode() -> implode() 3e2762b PEAR can only handle one extends tag 4a7fbde [mms] Add Horde_ListHeaders#headers(). 2351bcf Horde_Mime_Headers#listHeaders() is deprecated 9e7d453 Merge branch 'master' into imp_6_2 Summary: http://github.com/horde/horde/compare/d0fc65af9715470f4e2bffe8726604ce3a064e1d...9e7d45361cc966136305c5d6a0c2955509163391 ----------------------------------------------------------------------- commit 585f0ba4f71ec230ed3b543dc2f44fcaa0c32b7f Author: Michael Cramer <[email protected]> Date: Fri Sep 20 19:40:59 2013 +0200 use https image urls when horde runs in https environment this fixes bug #9983 from bugs.horde.org now that the response of the api includes also an https url this should be used for https sites horde/services/twitter/index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/585f0ba4f71ec230ed3b543dc2f44fcaa0c32b7f http://git.horde.org/horde-git/-/commit/585f0ba4f71ec230ed3b543dc2f44fcaa0c32b7f ----------------------------------------------------------------------- commit ae9485b8955668815ee378f54480493066f57932 Author: Michael Cramer <[email protected]> Date: Thu Oct 17 15:37:51 2013 +0200 Update index.php $GLOBALS['browser']->usingSSLConnection() instead of $_SERVER['HTTPS'] horde/services/twitter/index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/ae9485b8955668815ee378f54480493066f57932 http://git.horde.org/horde-git/-/commit/ae9485b8955668815ee378f54480493066f57932 ----------------------------------------------------------------------- commit 1af205721e13864cca96a42b2b6171152b54d2af Author: Michael M Slusarz <[email protected]> Date: Thu Oct 17 08:05:12 2013 -0600 Fix links horde/docs/INSTALL | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/1af205721e13864cca96a42b2b6171152b54d2af http://git.horde.org/horde-git/-/commit/1af205721e13864cca96a42b2b6171152b54d2af ----------------------------------------------------------------------- commit 912d96f37d3a18f919f8d54b3976176a739416ab Author: Jan Schneider <[email protected]> Date: Thu Oct 17 16:32:49 2013 +0200 Revert "Fix links" This reverts commit 1af205721e13864cca96a42b2b6171152b54d2af. horde/docs/INSTALL | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/912d96f37d3a18f919f8d54b3976176a739416ab http://git.horde.org/horde-git/-/commit/912d96f37d3a18f919f8d54b3976176a739416ab ----------------------------------------------------------------------- commit 5fbbcaefd39d391c65672351f9f30cbbf651af0e Author: Jan Schneider <[email protected]> Date: Thu Oct 17 16:42:41 2013 +0200 Fix links correctly. horde/docs/INSTALL | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) http://github.com/horde/horde/commit/5fbbcaefd39d391c65672351f9f30cbbf651af0e http://git.horde.org/horde-git/-/commit/5fbbcaefd39d391c65672351f9f30cbbf651af0e ----------------------------------------------------------------------- commit 0790dbfcbb62661eb11d02c7fceda96c462daecd Author: Michael J Rubinsky <[email protected]> Date: Thu Oct 17 11:10:38 2013 -0400 explode() -> implode() framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/0790dbfcbb62661eb11d02c7fceda96c462daecd http://git.horde.org/horde-git/-/commit/0790dbfcbb62661eb11d02c7fceda96c462daecd ----------------------------------------------------------------------- commit 3e2762ba3b843bd1d2ce2429ba5b24079b8eb69f Author: Michael M Slusarz <[email protected]> Date: Thu Oct 17 13:52:11 2013 -0600 PEAR can only handle one extends tag framework/Icalendar/package.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/3e2762ba3b843bd1d2ce2429ba5b24079b8eb69f http://git.horde.org/horde-git/-/commit/3e2762ba3b843bd1d2ce2429ba5b24079b8eb69f ----------------------------------------------------------------------- commit 4a7fbde4af94f7976b041dc7aa1008a0e2110628 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 17 17:52:55 2013 -0600 [mms] Add Horde_ListHeaders#headers(). framework/ListHeaders/lib/Horde/ListHeaders.php | 20 ++++ framework/ListHeaders/lib/Horde/ListHeaders/Translation.php | 57 +++++++++++ framework/ListHeaders/locale/Horde_ListHeaders.pot | 46 +++++++++ framework/ListHeaders/package.xml | 32 ++++-- 4 files changed, 146 insertions(+), 9 deletions(-) create mode 100644 framework/ListHeaders/lib/Horde/ListHeaders/Translation.php create mode 100644 framework/ListHeaders/locale/Horde_ListHeaders.pot http://github.com/horde/horde/commit/4a7fbde4af94f7976b041dc7aa1008a0e2110628 http://git.horde.org/horde-git/-/commit/4a7fbde4af94f7976b041dc7aa1008a0e2110628 ----------------------------------------------------------------------- commit 2351bcf83f830618cc1a60f28e23531f1869805d Author: Michael M Slusarz <[email protected]> Date: Thu Oct 17 17:53:24 2013 -0600 Horde_Mime_Headers#listHeaders() is deprecated framework/Mime/lib/Horde/Mime/Headers.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://github.com/horde/horde/commit/2351bcf83f830618cc1a60f28e23531f1869805d http://git.horde.org/horde-git/-/commit/2351bcf83f830618cc1a60f28e23531f1869805d ----------------------------------------------------------------------- commit 9e7d45361cc966136305c5d6a0c2955509163391 Merge: d0fc65a 2351bcf Author: Michael M Slusarz <[email protected]> Date: Thu Oct 17 18:48:01 2013 -0600 Merge branch 'master' into imp_6_2 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 +- framework/Icalendar/package.xml | 1 - framework/ListHeaders/lib/Horde/ListHeaders.php | 20 ++++ framework/ListHeaders/lib/Horde/ListHeaders/Translation.php | 57 +++++++++++ framework/ListHeaders/locale/Horde_ListHeaders.pot | 46 +++++++++ framework/ListHeaders/package.xml | 32 ++++-- framework/Mime/lib/Horde/Mime/Headers.php | 2 + horde/docs/INSTALL | 24 ++-- horde/services/twitter/index.php | 2 +- 9 files changed, 163 insertions(+), 24 deletions(-) http://github.com/horde/horde/commit/9e7d45361cc966136305c5d6a0c2955509163391 http://git.horde.org/horde-git/-/commit/9e7d45361cc966136305c5d6a0c2955509163391 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
