[commits] Horde branch develop updated. ee77a6f0fa500986fe6a5d1b29b79c339e8e245c
Michael M Slusarz
slusarz at horde.org
Thu Mar 29 17:14:08 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: f526d57df953211b2c9b3fa7cc8c2e714ea4b957
bbed8d4 Only show branch list if multiple branches exist.
5e7c4e3 Fix generating logs for merge commits.
5d7ca02 Fix bad merge
2ae7ba9 Upgraded scriptaculous to 1.9.0
8a852a1 Ensure loading image is always fully opaque when loaded
0c23fef I guess this was supposed to a third. Allow expanding too.
208051e Fix sending ID request.
ef11217 Bug #11111: Attempt to workaround broken Cyrus servers
6ad7a88 Bug #11111: changelog
ee77a6f Merge branch 'master' into develop
-----------------------------------------------------------------------
commit bbed8d483eb9e97d24a27fd2a2d14ed1abcd7903
Author: Jan Schneider <jan at horde.org>
Date: Wed Mar 28 21:24:28 2012 +0200
Only show branch list if multiple branches exist.
chora/browsefile.php | 9 ++-------
chora/templates/log/header.inc | 7 +++++--
2 files changed, 7 insertions(+), 9 deletions(-)
http://git.horde.org/horde-git/-/commit/bbed8d483eb9e97d24a27fd2a2d14ed1abcd7903
-----------------------------------------------------------------------
commit 5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a
Author: Jan Schneider <jan at horde.org>
Date: Wed Mar 28 21:47:39 2012 +0200
Fix generating logs for merge commits.
framework/Vcs/lib/Horde/Vcs/Log/Git.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/5e7c4e39b0d37f1a9d1beb7769e48fb266b7c77a
-----------------------------------------------------------------------
commit 5d7ca028e6fa4c639d3d75e94b6dbd80fcad3d37
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Mar 28 23:25:11 2012 -0600
Fix bad merge
framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/5d7ca028e6fa4c639d3d75e94b6dbd80fcad3d37
-----------------------------------------------------------------------
commit 2ae7ba9d7d41c27b0745c3523d4a9db61c00d12b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Mar 29 10:45:31 2012 -0600
Upgraded scriptaculous to 1.9.0
Moved scripts to subdirectory
ansel/faces/custom.php | 8 +-
ansel/faces/search/image_define.php | 4 +-
ansel/image.php | 16 +-
ansel/lib/Ajax/Imple/EditCaption.php | 2 +-
ansel/lib/View/EmbeddedRenderer/Mini.php | 2 +-
ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 4 +-
ansel/lib/View/Image.php | 4 +-
ansel/lib/View/Upload.php | 2 +-
folks/search.php | 2 +-
framework/Core/lib/Horde/Core/Ajax.php | 6 +-
framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php | 2 +-
framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php | 2 +-
framework/Core/lib/Horde/Core/Text/Filter/Highlightquotes.php | 2 +-
framework/Form/lib/Horde/Form/Action/reload.php | 2 +-
framework/Form/lib/Horde/Form/Action/submit.php | 2 +-
gollem/manager.php | 2 +-
hermes/lib/Ajax.php | 2 +-
horde/js/builder.js | 136 -
horde/js/controls.js | 965 -------
horde/js/dragdrop.js | 974 -------
horde/js/effects.js | 1123 ---------
horde/js/scriptaculous.js | 68 -
horde/js/scriptaculous/builder.js | 136 +
horde/js/scriptaculous/controls.js | 965 +++++++
horde/js/scriptaculous/dragdrop.js | 974 +++++++
horde/js/scriptaculous/effects.js | 1123 +++++++++
horde/js/scriptaculous/scriptaculous.js | 68 +
horde/js/scriptaculous/slider.js | 275 ++
horde/js/scriptaculous/sound.js | 59 +
horde/js/scriptaculous/unittest.js | 568 +++++
horde/js/slider.js | 275 --
horde/js/sound.js | 59 -
horde/lib/Block/TwitterTimeline.php | 4 +-
imp/lib/Ajax/Imple/PassphraseDialog.php | 2 +-
imp/mailbox.php | 2 +-
imp/message.php | 2 +-
kronolith/templates/panel.inc | 2 +-
mnemo/lib/Ajax/Imple/EditNote.php | 2 +-
nag/lib/Application.php | 2 +-
nag/list.php | 2 +-
nag/tasks/index.php | 2 +-
nag/templates/panel.inc | 2 +-
turba/lib/Application.php | 4 +-
turba/lib/View/Browse.php | 2 +-
turba/search.php | 2 +-
whups/lib/Form/Action/whups_reload.php | 2 +-
46 files changed, 4216 insertions(+), 3648 deletions(-)
delete mode 100644 horde/js/builder.js
delete mode 100644 horde/js/controls.js
delete mode 100644 horde/js/dragdrop.js
delete mode 100644 horde/js/effects.js
delete mode 100644 horde/js/scriptaculous.js
create mode 100644 horde/js/scriptaculous/builder.js
create mode 100644 horde/js/scriptaculous/controls.js
create mode 100644 horde/js/scriptaculous/dragdrop.js
create mode 100644 horde/js/scriptaculous/effects.js
create mode 100644 horde/js/scriptaculous/scriptaculous.js
create mode 100644 horde/js/scriptaculous/slider.js
create mode 100644 horde/js/scriptaculous/sound.js
create mode 100644 horde/js/scriptaculous/unittest.js
delete mode 100644 horde/js/slider.js
delete mode 100644 horde/js/sound.js
http://git.horde.org/horde-git/-/commit/2ae7ba9d7d41c27b0745c3523d4a9db61c00d12b
-----------------------------------------------------------------------
commit 8a852a1136673f077d1b6b07e992fecc6cb549de
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Mar 29 10:52:23 2012 -0600
Ensure loading image is always fully opaque when loaded
framework/Core/js/hordecore.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8a852a1136673f077d1b6b07e992fecc6cb549de
-----------------------------------------------------------------------
commit 0c23fef3bf547bf38e45f8382d458f024ab21f84
Author: Jan Schneider <jan at horde.org>
Date: Wed Mar 28 21:53:43 2012 +0200
I guess this was supposed to a third. Allow expanding too.
chora/themes/default/screen.css | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/0c23fef3bf547bf38e45f8382d458f024ab21f84
-----------------------------------------------------------------------
commit 208051e49a791b2301f413bb33890f942b0a0b26
Author: Jan Schneider <jan at horde.org>
Date: Thu Mar 29 17:29:38 2012 +0200
Fix sending ID request.
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 6 +++---
framework/Imap_Client/package.xml | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/208051e49a791b2301f413bb33890f942b0a0b26
-----------------------------------------------------------------------
commit ef112173cab44dada80771075cf071879fdf9da8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Mar 28 13:44:05 2012 -0600
Bug #11111: Attempt to workaround broken Cyrus servers
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/ef112173cab44dada80771075cf071879fdf9da8
-----------------------------------------------------------------------
commit 6ad7a88fc3d14006f79bd4c6f895f782df5f8f48
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Mar 29 11:09:14 2012 -0600
Bug #11111: changelog
framework/Imap_Client/package.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/6ad7a88fc3d14006f79bd4c6f895f782df5f8f48
-----------------------------------------------------------------------
commit ee77a6f0fa500986fe6a5d1b29b79c339e8e245c
Merge: 8a852a1 6ad7a88
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Mar 29 11:13:43 2012 -0600
Merge branch 'master' into develop
Conflicts:
framework/Imap_Client/package.xml
framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
chora/browsefile.php | 9 ++-------
chora/templates/log/header.inc | 7 +++++--
chora/themes/default/screen.css | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 6 +++---
framework/Imap_Client/package.xml | 1 +
framework/Vcs/lib/Horde/Vcs/Log/Git.php | 8 ++++++--
6 files changed, 18 insertions(+), 15 deletions(-)
http://git.horde.org/horde-git/-/commit/ee77a6f0fa500986fe6a5d1b29b79c339e8e245c
More information about the commits
mailing list