[commits] Horde branch master updated. b8fddd7910ba55bebea83680586e0e19785b6a8c
Jan Schneider
jan at horde.org
Thu Jul 29 09:53:24 UTC 2010
The branch "master" has been updated.
The following is a summary of the commits.
from: ab91d641afef9609a23cd5aea175e7d35aeafff4
3b4b0d7 Update to Prototype 1.7-RC2.
c37afb5 Integrate post-RC2 fixes from git.
e9da307 Fix BC in Hash.toJSON().
b378bec New prototypejs allows us to jettison this hackish code
7a57580 Merge branch 'newprototype' into prototype-1.7
b6c25a5 Fix dragging inside a scrolled view.
3c8646d Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
c9a1684 No longer used.
acb8a1f String.toJSON() no longer exists.
5903a93 Array.toJSON() no longer exists.
ee6139d RB_confirm is too specific - add to RB_window instead
da73e51 Revert "RB_confirm is too specific - add to RB_window instead"
d17f335 Revert my rejected fix, and pull in latest fixes from prototype. Fixes a positioning issue with redbox.
f938bc1 Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
0541c1b Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
6a443c3 Revert "RB_confirm is too specific - add to RB_window instead"
47eba91 Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
1b53372 Use Object.toJSON().
29625e5 Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
f8f027e Fix scroll offset issues.
40d2b92 Fix dragging in scrolled view correctly.
b8fddd7 Merge branch 'prototype-1.7'
-----------------------------------------------------------------------
commit 3b4b0d7f6522cc0bd8973fbe4816cd66f69070e4
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 17:56:37 2010 +0200
Update to Prototype 1.7-RC2.
horde/js/prototype.js | 3848 +++++++++++++++++++++++++------------------------
1 files changed, 1974 insertions(+), 1874 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=8b7dea70d5b9821baac636e337b4781d03c0cff6&r2=3b4b0d7f6522cc0bd8973fbe4816cd66f69070e4
-----------------------------------------------------------------------
commit c37afb58afa2424ae5e070e4d169305ee3bce9d9
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 17:59:21 2010 +0200
Integrate post-RC2 fixes from git.
horde/js/prototype.js | 127 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 43 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=3b4b0d7f6522cc0bd8973fbe4816cd66f69070e4&r2=c37afb58afa2424ae5e070e4d169305ee3bce9d9
-----------------------------------------------------------------------
commit e9da307989792c91670476750a2ba85fc7faf910
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 17:59:50 2010 +0200
Fix BC in Hash.toJSON().
horde/js/prototype.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=c37afb58afa2424ae5e070e4d169305ee3bce9d9&r2=e9da307989792c91670476750a2ba85fc7faf910
-----------------------------------------------------------------------
commit b378bec00ebd94d87291f10356a555e5ed4fd14d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Apr 13 00:30:40 2010 -0600
New prototypejs allows us to jettison this hackish code
imp/js/imp.js | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
http://git.horde.org/diff.php/imp/js/imp.js?rt=horde-git&r1=d6ddd5319c226270e0124d093a151c52eadca97b&r2=b378bec00ebd94d87291f10356a555e5ed4fd14d
-----------------------------------------------------------------------
commit 7a57580deed71706880064e9c53fbe28e91c47ad
Merge: e9da307 b378bec
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Wed Jun 30 11:46:46 2010 -0600
Merge branch 'newprototype' into prototype-1.7
imp/js/imp.js | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
http://git.horde.org/diff.php/imp/js/imp.js?rt=horde-git&r1=d6ddd5319c226270e0124d093a151c52eadca97b&r2=7a57580deed71706880064e9c53fbe28e91c47ad
-----------------------------------------------------------------------
commit b6c25a57a3d9bfacea760f7464cc4c9c7548f023
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 22:44:19 2010 +0200
Fix dragging inside a scrolled view.
kronolith/js/kronolith.js | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=020aeae63152abddaf2495d4f33cc945555790ad&r2=b6c25a57a3d9bfacea760f7464cc4c9c7548f023
-----------------------------------------------------------------------
commit 3c8646d87999c2b953d452885c5cc99871324652
Merge: b6c25a5 7a57580
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 23:35:16 2010 +0200
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
imp/js/imp.js | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
http://git.horde.org/diff.php/imp/js/imp.js?rt=horde-git&r1=d6ddd5319c226270e0124d093a151c52eadca97b&r2=3c8646d87999c2b953d452885c5cc99871324652
-----------------------------------------------------------------------
commit c9a16841e90729870e0417851860df1c28431524
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 23:39:31 2010 +0200
No longer used.
kronolith/js/kronolith.js | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=b6c25a57a3d9bfacea760f7464cc4c9c7548f023&r2=c9a16841e90729870e0417851860df1c28431524
-----------------------------------------------------------------------
commit acb8a1f1a36db0b9873bc98e8e9174737bbc02dc
Author: Jan Schneider <jan at horde.org>
Date: Wed Jun 30 23:58:04 2010 +0200
String.toJSON() no longer exists.
horde/js/hordetree.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/diff.php/horde/js/hordetree.js?rt=horde-git&r1=9f3c620977d75ac9e8b9de2bdb81b46519972609&r2=acb8a1f1a36db0b9873bc98e8e9174737bbc02dc
-----------------------------------------------------------------------
commit 5903a93a438dc24abfc78fe29559d94c6d187940
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Thu Jul 1 15:15:12 2010 -0600
Array.toJSON() no longer exists.
imp/js/dimpbase.js | 6 +++---
imp/js/search.js | 2 +-
imp/js/viewport.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/diff.php/imp/js/dimpbase.js?rt=horde-git&r1=0217d059e2e1a8f9bab3193d863996ef5c80a7c7&r2=5903a93a438dc24abfc78fe29559d94c6d187940
http://git.horde.org/diff.php/imp/js/search.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=5903a93a438dc24abfc78fe29559d94c6d187940
http://git.horde.org/diff.php/imp/js/viewport.js?rt=horde-git&r1=76c1c091e8c027ce77dea8d76ceb2fef5d4cecb4&r2=5903a93a438dc24abfc78fe29559d94c6d187940
-----------------------------------------------------------------------
commit ee6139d3d2cec11152d3eac4422ce59b2c3f0034
Author: Michael M Slusarz <slusarz at curecanti.org>
Date: Tue Jul 6 21:53:12 2010 -0600
RB_confirm is too specific - add to RB_window instead
horde/themes/screen.css | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=45d58456f24b121efb9d4082306dbe93076b7172&r2=ee6139d3d2cec11152d3eac4422ce59b2c3f0034
-----------------------------------------------------------------------
commit da73e5188abf68eca24baa388d6db352eff600b0
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 11:19:24 2010 +0200
Revert "RB_confirm is too specific - add to RB_window instead"
There was a reason this was so specific. We already use forms in RB dialogs,
e.g. in Kronolith, that we don't want to look like a confirm dialog.
This reverts commit 59140912dd17385553124964ec4c8d824fa753b2.
horde/themes/screen.css | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=ee6139d3d2cec11152d3eac4422ce59b2c3f0034&r2=da73e5188abf68eca24baa388d6db352eff600b0
-----------------------------------------------------------------------
commit d17f3356a4b7f006226afb853526bb6f120c7d4a
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 12:20:28 2010 +0200
Revert my rejected fix, and pull in latest fixes from prototype. Fixes a positioning issue with redbox.
horde/js/prototype.js | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=e9da307989792c91670476750a2ba85fc7faf910&r2=d17f3356a4b7f006226afb853526bb6f120c7d4a
-----------------------------------------------------------------------
commit f938bc131c2ea5cfa7f125b096c9016a35b23443
Merge: d17f335 ee6139d
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 12:41:11 2010 +0200
Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
horde/themes/screen.css | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=45d58456f24b121efb9d4082306dbe93076b7172&r2=f938bc131c2ea5cfa7f125b096c9016a35b23443
-----------------------------------------------------------------------
commit 0541c1b25837ad4701a5979e3e9c488d53ef0dbe
Merge: da73e51 f938bc1
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 12:42:01 2010 +0200
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
horde/js/prototype.js | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=e9da307989792c91670476750a2ba85fc7faf910&r2=0541c1b25837ad4701a5979e3e9c488d53ef0dbe
-----------------------------------------------------------------------
commit 6a443c3842a9894488ea534f64c252d26e634502
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 11:19:24 2010 +0200
Revert "RB_confirm is too specific - add to RB_window instead"
There was a reason this was so specific. We already use forms in RB dialogs,
e.g. in Kronolith, that we don't want to look like a confirm dialog.
This reverts commit 59140912dd17385553124964ec4c8d824fa753b2.
horde/themes/screen.css | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=ee6139d3d2cec11152d3eac4422ce59b2c3f0034&r2=6a443c3842a9894488ea534f64c252d26e634502
-----------------------------------------------------------------------
commit 47eba91fe13f787a1ff3bbad6a4435d7c3d386bb
Merge: 6a443c3 0541c1b
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 13:02:00 2010 +0200
Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
-----------------------------------------------------------------------
commit 1b5337226a157dd74310fa56f124a4ffa1795997
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 16:10:58 2010 +0200
Use Object.toJSON().
kronolith/js/kronolith.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=c9a16841e90729870e0417851860df1c28431524&r2=1b5337226a157dd74310fa56f124a4ffa1795997
-----------------------------------------------------------------------
commit 29625e5a31cd167cfc5f211e1debeeb9d0b65b90
Merge: 1b53372 47eba91
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 16:13:04 2010 +0200
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
-----------------------------------------------------------------------
commit f8f027e4fff87f88495b80dceb1b2d295c951b45
Author: Jan Schneider <jan at horde.org>
Date: Wed Jul 7 18:25:21 2010 +0200
Fix scroll offset issues.
kronolith/js/kronolith.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=1b5337226a157dd74310fa56f124a4ffa1795997&r2=f8f027e4fff87f88495b80dceb1b2d295c951b45
-----------------------------------------------------------------------
commit 40d2b922ff191bbeba0d03f1d24156cd07ea9917
Author: Jan Schneider <jan at horde.org>
Date: Sat Jul 10 11:47:19 2010 +0200
Fix dragging in scrolled view correctly.
kronolith/js/kronolith.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=f8f027e4fff87f88495b80dceb1b2d295c951b45&r2=40d2b922ff191bbeba0d03f1d24156cd07ea9917
-----------------------------------------------------------------------
commit b8fddd7910ba55bebea83680586e0e19785b6a8c
Merge: ab91d64 40d2b92
Author: Jan Schneider <jan at horde.org>
Date: Thu Jul 29 11:52:48 2010 +0200
Merge branch 'prototype-1.7'
horde/js/prototype.js | 3949 +++++++++++++++++++++++----------------------
imp/js/dimpbase.js | 6 +-
imp/js/imp.js | 14 -
imp/js/search.js | 2 +-
imp/js/viewport.js | 2 +-
kronolith/js/kronolith.js | 20 +-
6 files changed, 2073 insertions(+), 1920 deletions(-)
http://git.horde.org/diff.php/horde/js/prototype.js?rt=horde-git&r1=8b7dea70d5b9821baac636e337b4781d03c0cff6&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
http://git.horde.org/diff.php/imp/js/dimpbase.js?rt=horde-git&r1=37db1ae919326399b18d6d2eacfdec37e5c632d9&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
http://git.horde.org/diff.php/imp/js/imp.js?rt=horde-git&r1=b077e75cf250faa5be9fdda55431621709b71508&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
http://git.horde.org/diff.php/imp/js/search.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
http://git.horde.org/diff.php/imp/js/viewport.js?rt=horde-git&r1=76c1c091e8c027ce77dea8d76ceb2fef5d4cecb4&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=b9865ab2fafe2738bf568fbd790d9dd73dccdf50&r2=b8fddd7910ba55bebea83680586e0e19785b6a8c
More information about the commits
mailing list