The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 967fd402014c3f7e1fbae46504886ae3bba308a6 3ba1796 Remove ridiculous BC-ish code from upstream OL. 699a5e4 BFN 6f43f62 No need to echo this, the method does the output. c8c4219 Convert Image View to Horde_View 4d5b5d3 Not needed 1ae8a6a Pass the background color to the view. 817d20e Tweak some css, better dom ids. f9690c9 Not needed 786f864 Dead file 4d9cc6b Explicitly mention we need at least IE8 and no compatibility mode (Request #12026) 13e3e9c [mms] Upgrade jQuery Mobile to v1.2/jQuery Core to v1.8.3. 5f95730 Revert "Foo" 19769da Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 3ba17968b2a7b8a017094d7eea4de0e11b81cc7c Author: Michael J Rubinsky <[email protected]> Date: Wed Feb 6 18:06:30 2013 -0500 Remove ridiculous BC-ish code from upstream OL. This was put in place to provide "BC" for some example code on the website that used a Global Event object stolen from Prototypejs. Breaks all kinds of stuff for us, and is completely unnecessary. It's slated for removal in OL 3.0. Fixes Bug: 12019 framework/Core/js/map/OpenLayers-debug.js | 8 - framework/Core/js/map/OpenLayers.js | 1943 ++++++++++++++++++----------- framework/Core/package.xml | 2 + 3 files changed, 1192 insertions(+), 761 deletions(-) http://git.horde.org/horde-git/-/commit/3ba17968b2a7b8a017094d7eea4de0e11b81cc7c ----------------------------------------------------------------------- commit 699a5e46563c9f36027980b372623ee8a44749f4 Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 00:45:45 2013 -0500 BFN content/docs/CHANGES | 2 ++ content/package.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/699a5e46563c9f36027980b372623ee8a44749f4 ----------------------------------------------------------------------- commit 6f43f62a3d9b28ac49461808f04980a6b2ecd07d Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 10:30:14 2013 -0500 No need to echo this, the method does the output. ansel/templates/view/gallery.html.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/6f43f62a3d9b28ac49461808f04980a6b2ecd07d ----------------------------------------------------------------------- commit c8c4219b0afeb7794dd867411b422e1a7343f443 Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 11:57:14 2013 -0500 Convert Image View to Horde_View ansel/js/views/image.js | 57 ++++++++ ansel/lib/Image.php | 30 ++--- ansel/lib/View/Image.php | 257 +++++++++++++++-------------------- ansel/templates/view/image.html.php | 98 +++++++++++++ ansel/themes/default/screen.css | 6 + 5 files changed, 282 insertions(+), 166 deletions(-) create mode 100644 ansel/js/views/image.js http://git.horde.org/horde-git/-/commit/c8c4219b0afeb7794dd867411b422e1a7343f443 ----------------------------------------------------------------------- commit 4d5b5d351458b5bcc04d0eedc870b1b02bfa03e6 Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 12:00:53 2013 -0500 Not needed ansel/templates/view/image.html.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/4d5b5d351458b5bcc04d0eedc870b1b02bfa03e6 ----------------------------------------------------------------------- commit 1ae8a6a8dbf44ac4f85a51c405adf9e0618ce364 Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 12:02:25 2013 -0500 Pass the background color to the view. ansel/lib/View/Image.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/1ae8a6a8dbf44ac4f85a51c405adf9e0618ce364 ----------------------------------------------------------------------- commit 817d20ee2bd5fba1332ad12197665aba9e1cc8aa Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 12:34:20 2013 -0500 Tweak some css, better dom ids. ansel/js/imagefaces.js | 4 ++-- ansel/js/views/image.js | 10 +++++----- ansel/lib/View/Image.php | 2 +- ansel/templates/view/image.html.php | 8 ++++---- ansel/themes/default/screen.css | 12 +++++------- 5 files changed, 17 insertions(+), 19 deletions(-) http://git.horde.org/horde-git/-/commit/817d20ee2bd5fba1332ad12197665aba9e1cc8aa ----------------------------------------------------------------------- commit f9690c9f72d04fe32c912c8013f4cadb50d59b6e Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 12:36:17 2013 -0500 Not needed ansel/templates/view/image.html.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/f9690c9f72d04fe32c912c8013f4cadb50d59b6e ----------------------------------------------------------------------- commit 786f8645a0e728d5450a236236e657e7eca3da51 Author: Michael J Rubinsky <[email protected]> Date: Thu Feb 7 12:36:42 2013 -0500 Dead file ansel/templates/view/image.inc | 96 ---------------------------------------- 1 files changed, 0 insertions(+), 96 deletions(-) delete mode 100644 ansel/templates/view/image.inc http://git.horde.org/horde-git/-/commit/786f8645a0e728d5450a236236e657e7eca3da51 ----------------------------------------------------------------------- commit 4d9cc6b93d5d31697f3cadaa3426f78c021efe96 Author: Thomas Jarosch <[email protected]> Date: Thu Feb 7 17:45:28 2013 +0100 Explicitly mention we need at least IE8 and no compatibility mode (Request #12026) Signed-off-by: Michael M Slusarz <[email protected]> framework/Core/lib/Horde/Core/Auth/Application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/4d9cc6b93d5d31697f3cadaa3426f78c021efe96 ----------------------------------------------------------------------- commit 13e3e9c3aabb8b2d9b5e8c3d3e7aded4c83046ef Author: Michael M Slusarz <[email protected]> Date: Thu Feb 7 13:01:15 2013 -0700 [mms] Upgrade jQuery Mobile to v1.2/jQuery Core to v1.8.3. framework/Core/js/jquery.mobile/jquery.js | 8342 +++++++++-------- framework/Core/js/jquery.mobile/jquery.min.js | 6 +- framework/Core/js/jquery.mobile/jquery.mobile.js | 5531 +++++++----- framework/Core/js/jquery.mobile/jquery.mobile.min.css | 4 +- framework/Core/js/jquery.mobile/jquery.mobile.min.js | 186 +- framework/Core/package.xml | 2 + 6 files changed, 7708 insertions(+), 6363 deletions(-) http://git.horde.org/horde-git/-/commit/13e3e9c3aabb8b2d9b5e8c3d3e7aded4c83046ef ----------------------------------------------------------------------- commit 5f95730795bd4ee82fa1faff7bae2fb890136675 Author: Michael M Slusarz <[email protected]> Date: Thu Feb 7 13:09:55 2013 -0700 Revert "Foo" This reverts commit 7d62b2159549db197dc747ac9152abbcaeb11be3. Not needed - this is a PHP issue framework/Mime/test/Horde/Mime/PartTest.php | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) http://git.horde.org/horde-git/-/commit/5f95730795bd4ee82fa1faff7bae2fb890136675 ----------------------------------------------------------------------- commit 19769da2490d35d5b68b70b849c5eb9a33f6a0a7 Merge: 5f95730 13e3e9c Author: Michael M Slusarz <[email protected]> Date: Thu Feb 7 13:10:09 2013 -0700 Merge branch 'master' into imp_6_1 ansel/js/imagefaces.js | 4 +- ansel/js/views/image.js | 57 + ansel/lib/Image.php | 30 +- ansel/lib/View/Image.php | 260 +- ansel/templates/view/gallery.html.php | 2 +- ansel/templates/view/image.html.php | 98 + ansel/templates/view/image.inc | 96 - ansel/themes/default/screen.css | 18 +- content/docs/CHANGES | 2 + content/package.xml | 4 +- framework/Core/js/jquery.mobile/jquery.js | 8342 +++++++++-------- framework/Core/js/jquery.mobile/jquery.min.js | 6 +- framework/Core/js/jquery.mobile/jquery.mobile.js | 5531 +++++++----- framework/Core/js/jquery.mobile/jquery.mobile.min.css | 4 +- framework/Core/js/jquery.mobile/jquery.mobile.min.js | 186 +- framework/Core/js/map/OpenLayers-debug.js | 8 - framework/Core/js/map/OpenLayers.js | 1943 +++-- framework/Core/lib/Horde/Core/Auth/Application.php | 2 +- framework/Core/package.xml | 4 + 19 files changed, 9197 insertions(+), 7400 deletions(-) http://git.horde.org/horde-git/-/commit/19769da2490d35d5b68b70b849c5eb9a33f6a0a7 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
