[commits] Horde branch develop updated. 285f1aaecd7b32a0e45b74896f5f4adf7b49e70b
Michael M Slusarz
slusarz at horde.org
Thu Dec 29 08:22:16 UTC 2011
The branch "develop" has been updated.
The following is a summary of the commits.
from: c72e82f941375a78657267f2e615b57d63e5379f
bb9f41d Provide notification when trying to create mailbox that already exists.
693f455 Revert "Sanity checking"
2414eb9 Add file with unicode characters.
3c98a52 Decode file names.
18761e8 Add tests for Unicode file names (Bug #9512).
c018197 Pass ajaxui parameter through form submissions too (Bug #10777).
c182d58 Try to debug CI failure.
b8f7d7d Try to create parent directories too.
bd7462b Remove debug code.
707763d basename() needs a unicode locale to support unicode file names.
6d17037 Revert "Try to create parent directories too."
4b3a585 More debug output for CI.
413d6c9 CS fixes.
f0a9d93 I give up.
72ff926 Fix parse error.
285f1aa Merge branch 'master' into develop
-----------------------------------------------------------------------
commit bb9f41d70db6da814a3dff6b8bf99483e9d425a4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 27 16:57:49 2011 -0700
Provide notification when trying to create mailbox that already exists.
imp/folders.php | 9 +++++++--
imp/lib/Ajax/Application.php | 11 +++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/bb9f41d70db6da814a3dff6b8bf99483e9d425a4
-----------------------------------------------------------------------
commit 693f455e25aaadf15b0fc48cc65ad5f7425f360f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 27 17:07:44 2011 -0700
Revert "Sanity checking"
This reverts commit c2720f3e2e6bef0785c49c697afcc2beb7076c8b.
This broke special prefs handling.
framework/Core/js/identityselect.js | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/693f455e25aaadf15b0fc48cc65ad5f7425f360f
-----------------------------------------------------------------------
commit 2414eb94b15a7ecc6177b91906ea37012c6af292
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 14:54:28 2011 +0100
Add file with unicode characters.
framework/Vcs/test/Horde/Vcs/CvsTest.php | 8 +-
framework/Vcs/test/Horde/Vcs/GitTest.php | 10 +-
framework/Vcs/test/Horde/Vcs/RcsTest.php | 4 +-
framework/Vcs/test/Horde/Vcs/SvnTest.php | 4 +-
framework/Vcs/test/Horde/Vcs/repos/cvs/CVSROOT/history | 1 +
.../Vcs/test/Horde/Vcs/repos/cvs/module/uml\303\244\303\274te,v" | 24 +++
.../repos/git/objects/2d/701be7faf94a5fad1942eb763b6c5c6cae540f | 3 +
.../repos/git/objects/3b/cf41c666638b371cfa1f12a5daeac3ceec9453 | Bin 0 -> 116 bytes
.../repos/git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes
framework/Vcs/test/Horde/Vcs/repos/git/refs/heads/master | 2 +-
"framework/Vcs/test/Horde/Vcs/repos/rcs/uml\303\244\303\274te,v" | 24 +++
framework/Vcs/test/Horde/Vcs/repos/svn/db/current | 2 +-
framework/Vcs/test/Horde/Vcs/repos/svn/db/rep-cache.db | Bin 4096 -> 4096 bytes
framework/Vcs/test/Horde/Vcs/repos/svn/db/revprops/0/3 | 13 ++
framework/Vcs/test/Horde/Vcs/repos/svn/db/revs/0/3 | 36 +++++
framework/Vcs/test/Horde/Vcs/repos/svn/db/txn-current | 2 +-
16 files changed, 117 insertions(+), 16 deletions(-)
create mode 100644 "framework/Vcs/test/Horde/Vcs/repos/cvs/module/uml\303\244\303\274te,v"
create mode 100644 framework/Vcs/test/Horde/Vcs/repos/git/objects/2d/701be7faf94a5fad1942eb763b6c5c6cae540f
create mode 100644 framework/Vcs/test/Horde/Vcs/repos/git/objects/3b/cf41c666638b371cfa1f12a5daeac3ceec9453
create mode 100644 framework/Vcs/test/Horde/Vcs/repos/git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
create mode 100644 "framework/Vcs/test/Horde/Vcs/repos/rcs/uml\303\244\303\274te"
create mode 100644 "framework/Vcs/test/Horde/Vcs/repos/rcs/uml\303\244\303\274te,v"
create mode 100644 framework/Vcs/test/Horde/Vcs/repos/svn/db/revprops/0/3
create mode 100644 framework/Vcs/test/Horde/Vcs/repos/svn/db/revs/0/3
http://git.horde.org/horde-git/-/commit/2414eb94b15a7ecc6177b91906ea37012c6af292
-----------------------------------------------------------------------
commit 3c98a52c3ab308ff9ce36719438936a9e7171846
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 15:58:31 2011 +0100
Decode file names.
It would be cleaner to use the -z argument for ls-tree instead, but then we
could no longer use fgets() to parse the directory listing efficiently line by
line.
framework/Vcs/lib/Horde/Vcs/Directory/Git.php | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/3c98a52c3ab308ff9ce36719438936a9e7171846
-----------------------------------------------------------------------
commit 18761e815b2a3fdc308b4a6ca1c921c991b008ba
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 15:59:19 2011 +0100
Add tests for Unicode file names (Bug #9512).
framework/Vcs/test/Horde/Vcs/CvsTest.php | 22 ++++++++++++++++++++
framework/Vcs/test/Horde/Vcs/GitTest.php | 32 ++++++++++++++++++++++++++++++
framework/Vcs/test/Horde/Vcs/RcsTest.php | 22 ++++++++++++++++++++
framework/Vcs/test/Horde/Vcs/SvnTest.php | 21 +++++++++++++++++++
4 files changed, 97 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/18761e815b2a3fdc308b4a6ca1c921c991b008ba
-----------------------------------------------------------------------
commit c01819752d69a4a6fc65e246829e9f56e73b1fe8
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 17:44:50 2011 +0100
Pass ajaxui parameter through form submissions too (Bug #10777).
This is not completely valid, because form parameters should be passed as form
fields and not URL parameters, but it works in all browsers and it is the only
way to fix this without breaking BC.
agora/ban.php | 2 +-
agora/deleteforum.php | 2 +-
agora/editforum.php | 2 +-
agora/messages/abuse.php | 2 +-
agora/messages/delete.php | 2 +-
agora/messages/edit.php | 2 +-
agora/messages/index.php | 2 +-
agora/messages/lock.php | 2 +-
agora/messages/merge.php | 2 +-
agora/messages/move.php | 2 +-
agora/messages/split.php | 2 +-
agora/moderators.php | 2 +-
agora/search.php | 2 +-
ansel/gallery/sort.php | 2 +-
ansel/image.php | 6 +++---
ansel/img/ecard.php | 2 +-
ansel/templates/image/upload.inc | 2 +-
framework/Model/www/test.php | 2 +-
hermes/deliverables.php | 4 ++--
hermes/entry.php | 2 +-
hermes/search.php | 4 ++--
hermes/start.php | 2 +-
horde/admin/cmdshell.php | 2 +-
horde/admin/config/config.php | 2 +-
horde/admin/config/index.php | 2 +-
horde/admin/phpshell.php | 2 +-
horde/services/changepassword.php | 2 +-
horde/templates/login/mobile.inc | 2 +-
horde/templates/login/resetpassword.inc | 2 +-
horde/templates/login/signup.inc | 2 +-
hylax/send.php | 2 +-
imp/lib/IMP.php | 1 +
imp/templates/imp/menu/menu.html | 2 +-
ingo/forward.php | 2 +-
ingo/lib/Ingo.php | 1 +
ingo/spam.php | 2 +-
ingo/templates/menu/menu.html | 2 +-
ingo/vacation.php | 2 +-
jonah/lib/View/ChannelEdit.php | 2 +-
jonah/lib/View/StoryDelete.php | 2 +-
jonah/lib/View/StoryEdit.php | 2 +-
jonah/stories/share.php | 2 +-
kronolith/calendars/create.php | 2 +-
kronolith/calendars/delete.php | 2 +-
kronolith/calendars/edit.php | 2 +-
kronolith/calendars/remote_edit.php | 2 +-
kronolith/calendars/remote_subscribe.php | 2 +-
kronolith/calendars/remote_unsubscribe.php | 2 +-
kronolith/resources/create.php | 2 +-
kronolith/resources/delete.php | 2 +-
kronolith/resources/edit.php | 2 +-
kronolith/resources/groups/create.php | 2 +-
kronolith/resources/groups/delete.php | 2 +-
kronolith/resources/groups/edit.php | 2 +-
kronolith/templates/delete/delete.inc | 2 +-
kronolith/templates/delete/one.inc | 2 +-
mnemo/notepads/create.php | 2 +-
mnemo/notepads/delete.php | 2 +-
mnemo/notepads/edit.php | 2 +-
mnemo/templates/memo/memo.inc | 4 ++--
nag/lib/Form/Task.php | 2 +-
nag/tasklists/create.php | 2 +-
nag/tasklists/delete.php | 2 +-
nag/tasklists/edit.php | 2 +-
sam/blacklist.php | 2 +-
sam/spam.php | 2 +-
sam/whitelist.php | 2 +-
sesha/admin.php | 4 ++--
sesha/search.php | 2 +-
sesha/templates/menu.inc | 2 +-
trean/templates/edit/delete_folder_confirmation.inc | 4 ++--
ulaform/delete.php | 2 +-
ulaform/deletefield.php | 2 +-
ulaform/edit.php | 2 +-
ulaform/fields.php | 2 +-
ulaform/genhtml.php | 2 +-
ulaform/sortfields.php | 2 +-
vilma/domains/delete.php | 2 +-
vilma/domains/edit.php | 2 +-
vilma/users/delete.php | 2 +-
vilma/users/edit.php | 2 +-
vilma/users/editAlias.php | 2 +-
vilma/users/editForward.php | 2 +-
vilma/virtuals/delete.php | 2 +-
vilma/virtuals/edit.php | 2 +-
whups/query/index.php | 2 +-
whups/search.php | 4 ++--
whups/ticket/comment.php | 2 +-
whups/ticket/delete.php | 2 +-
whups/ticket/queue.php | 6 +++---
whups/ticket/type.php | 4 ++--
whups/ticket/update.php | 2 +-
whups/ticket/watch.php | 4 ++--
93 files changed, 105 insertions(+), 103 deletions(-)
http://git.horde.org/horde-git/-/commit/c01819752d69a4a6fc65e246829e9f56e73b1fe8
-----------------------------------------------------------------------
commit c182d581d1fc1f86a0e00b6dc9bbc082e42ee9f2
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 18:20:27 2011 +0100
Try to debug CI failure.
framework/Vfs/lib/Horde/Vfs/File.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/c182d581d1fc1f86a0e00b6dc9bbc082e42ee9f2
-----------------------------------------------------------------------
commit b8f7d7d0d3fd382ee096b0e179b6f16e88877159
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 18:35:59 2011 +0100
Try to create parent directories too.
framework/Vfs/lib/Horde/Vfs/File.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/b8f7d7d0d3fd382ee096b0e179b6f16e88877159
-----------------------------------------------------------------------
commit bd7462bf9f19b77a851fb3f06a272195c3a19154
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:02:22 2011 +0100
Remove debug code.
framework/Vfs/lib/Horde/Vfs/File.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/bd7462bf9f19b77a851fb3f06a272195c3a19154
-----------------------------------------------------------------------
commit 707763d7b4eb05ff1e482269c21431f085e903c7
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:05:14 2011 +0100
basename() needs a unicode locale to support unicode file names.
framework/Vfs/test/Horde/Vfs/FileTest.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/707763d7b4eb05ff1e482269c21431f085e903c7
-----------------------------------------------------------------------
commit 6d170375263531a5d25c3fd621a31dca93cedb69
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:21:47 2011 +0100
Revert "Try to create parent directories too."
We do this explictly with the $autocreate parameters.
This reverts commit b8f7d7d0d3fd382ee096b0e179b6f16e88877159.
framework/Vfs/lib/Horde/Vfs/File.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/6d170375263531a5d25c3fd621a31dca93cedb69
-----------------------------------------------------------------------
commit 4b3a5855dab645f5e9125b76eaf34558c8a615f7
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:24:34 2011 +0100
More debug output for CI.
framework/Vfs/lib/Horde/Vfs/File.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/4b3a5855dab645f5e9125b76eaf34558c8a615f7
-----------------------------------------------------------------------
commit 413d6c9c43568070ea808a3024dadfe11a375a51
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:39:17 2011 +0100
CS fixes.
framework/Vfs/lib/Horde/Vfs/Base.php | 3 +-
framework/Vfs/lib/Horde/Vfs/File.php | 5 +--
framework/Vfs/lib/Horde/Vfs/Ftp.php | 35 +++++++++++++---------------
framework/Vfs/lib/Horde/Vfs/Gc.php | 4 +-
framework/Vfs/lib/Horde/Vfs/Sql.php | 3 +-
framework/Vfs/lib/Horde/Vfs/SqlFile.php | 4 +-
framework/Vfs/lib/Horde/Vfs/Ssh2.php | 38 +++++++++++++-----------------
7 files changed, 41 insertions(+), 51 deletions(-)
http://git.horde.org/horde-git/-/commit/413d6c9c43568070ea808a3024dadfe11a375a51
-----------------------------------------------------------------------
commit f0a9d93ebf99cb78ae151b4be408b80f2c671060
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:41:10 2011 +0100
I give up.
It works fine when running the test individually, the Unicode capable locale is
installed and obviously working, basename() is still broken, but only when
running the horde-git job.
framework/Vfs/lib/Horde/Vfs/File.php | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/f0a9d93ebf99cb78ae151b4be408b80f2c671060
-----------------------------------------------------------------------
commit 72ff926e3a6815c6b8e7efb2a4edc320663b18ad
Author: Jan Schneider <jan at horde.org>
Date: Wed Dec 28 19:41:43 2011 +0100
Fix parse error.
framework/Vfs/lib/Horde/Vfs/Ssh2.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/72ff926e3a6815c6b8e7efb2a4edc320663b18ad
-----------------------------------------------------------------------
commit 285f1aaecd7b32a0e45b74896f5f4adf7b49e70b
Merge: c72e82f 72ff926
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 29 01:21:52 2011 -0700
Merge branch 'master' into develop
Conflicts:
imp/folders.php
imp/lib/Ajax/Application.php
nag/lib/Form/Task.php
trean/templates/edit/delete_folder_confirmation.inc
agora/ban.php | 2 +-
agora/deleteforum.php | 2 +-
agora/editforum.php | 2 +-
agora/messages/abuse.php | 2 +-
agora/messages/delete.php | 2 +-
agora/messages/edit.php | 2 +-
agora/messages/index.php | 2 +-
agora/messages/lock.php | 2 +-
agora/messages/merge.php | 2 +-
agora/messages/move.php | 2 +-
agora/messages/split.php | 2 +-
agora/moderators.php | 2 +-
agora/search.php | 2 +-
ansel/gallery/sort.php | 2 +-
ansel/image.php | 6 +-
ansel/img/ecard.php | 2 +-
ansel/templates/image/upload.inc | 2 +-
framework/Core/js/identityselect.js | 3 -
framework/Model/www/test.php | 2 +-
framework/Vcs/lib/Horde/Vcs/Directory/Git.php | 5 +
framework/Vcs/test/Horde/Vcs/CvsTest.php | 30 +++-
framework/Vcs/test/Horde/Vcs/GitTest.php | 42 ++++-
framework/Vcs/test/Horde/Vcs/RcsTest.php | 26 +++-
framework/Vcs/test/Horde/Vcs/SvnTest.php | 25 +++-
framework/Vcs/test/Horde/Vcs/repos/cvs/CVSROOT/history | 1 +
.../Vcs/test/Horde/Vcs/repos/cvs/module/uml\303\244\303\274te,v" | 24 +++
.../repos/git/objects/2d/701be7faf94a5fad1942eb763b6c5c6cae540f | 3 +
.../repos/git/objects/3b/cf41c666638b371cfa1f12a5daeac3ceec9453 | Bin 0 -> 116 bytes
.../repos/git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes
framework/Vcs/test/Horde/Vcs/repos/git/refs/heads/master | 2 +-
"framework/Vcs/test/Horde/Vcs/repos/rcs/uml\303\244\303\274te,v" | 24 +++
framework/Vcs/test/Horde/Vcs/repos/svn/db/current | 2 +-
framework/Vcs/test/Horde/Vcs/repos/svn/db/rep-cache.db | Bin 4096 -> 4096 bytes
framework/Vcs/test/Horde/Vcs/repos/svn/db/revprops/0/3 | 13 ++
framework/Vcs/test/Horde/Vcs/repos/svn/db/revs/0/3 | 36 ++++
framework/Vcs/test/Horde/Vcs/repos/svn/db/txn-current | 2 +-
framework/Vfs/lib/Horde/Vfs/Base.php | 3 +-
framework/Vfs/lib/Horde/Vfs/File.php | 5 +-
framework/Vfs/lib/Horde/Vfs/Ftp.php | 35 ++--
framework/Vfs/lib/Horde/Vfs/Gc.php | 4 +-
framework/Vfs/lib/Horde/Vfs/Sql.php | 3 +-
framework/Vfs/lib/Horde/Vfs/SqlFile.php | 4 +-
framework/Vfs/lib/Horde/Vfs/Ssh2.php | 38 ++--
framework/Vfs/test/Horde/Vfs/FileTest.php | 1 +
hermes/deliverables.php | 4 +-
hermes/entry.php | 2 +-
hermes/search.php | 4 +-
hermes/start.php | 2 +-
horde/admin/cmdshell.php | 2 +-
horde/admin/config/config.php | 2 +-
horde/admin/config/index.php | 2 +-
horde/admin/phpshell.php | 2 +-
horde/services/changepassword.php | 2 +-
horde/templates/login/mobile.inc | 2 +-
horde/templates/login/resetpassword.inc | 2 +-
horde/templates/login/signup.inc | 2 +-
hylax/send.php | 2 +-
imp/folders.php | 9 +-
imp/lib/Ajax/Application.php | 11 +-
imp/lib/IMP.php | 1 +
imp/templates/imp/menu/menu.html | 2 +-
ingo/forward.php | 2 +-
ingo/lib/Ingo.php | 1 +
ingo/spam.php | 2 +-
ingo/templates/menu/menu.html | 2 +-
ingo/vacation.php | 2 +-
jonah/lib/View/ChannelEdit.php | 2 +-
jonah/lib/View/StoryDelete.php | 2 +-
jonah/lib/View/StoryEdit.php | 2 +-
jonah/stories/share.php | 2 +-
kronolith/calendars/create.php | 2 +-
kronolith/calendars/delete.php | 2 +-
kronolith/calendars/edit.php | 2 +-
kronolith/calendars/remote_edit.php | 2 +-
kronolith/calendars/remote_subscribe.php | 2 +-
kronolith/calendars/remote_unsubscribe.php | 2 +-
kronolith/resources/create.php | 2 +-
kronolith/resources/delete.php | 2 +-
kronolith/resources/edit.php | 2 +-
kronolith/resources/groups/create.php | 2 +-
kronolith/resources/groups/delete.php | 2 +-
kronolith/resources/groups/edit.php | 2 +-
kronolith/templates/delete/delete.inc | 2 +-
kronolith/templates/delete/one.inc | 2 +-
mnemo/notepads/create.php | 2 +-
mnemo/notepads/delete.php | 2 +-
mnemo/notepads/edit.php | 2 +-
mnemo/templates/memo/memo.inc | 4 +-
nag/lib/Form/Task.php | 2 +-
nag/tasklists/create.php | 2 +-
nag/tasklists/delete.php | 2 +-
nag/tasklists/edit.php | 2 +-
sam/blacklist.php | 2 +-
sam/spam.php | 2 +-
sam/whitelist.php | 2 +-
sesha/admin.php | 4 +-
sesha/search.php | 2 +-
sesha/templates/menu.inc | 2 +-
ulaform/delete.php | 2 +-
ulaform/deletefield.php | 2 +-
ulaform/edit.php | 2 +-
ulaform/fields.php | 2 +-
ulaform/genhtml.php | 2 +-
ulaform/sortfields.php | 2 +-
vilma/domains/delete.php | 2 +-
vilma/domains/edit.php | 2 +-
vilma/users/delete.php | 2 +-
vilma/users/edit.php | 2 +-
vilma/users/editAlias.php | 2 +-
vilma/users/editForward.php | 2 +-
vilma/virtuals/delete.php | 2 +-
vilma/virtuals/edit.php | 2 +-
whups/query/index.php | 2 +-
whups/search.php | 4 +-
whups/ticket/comment.php | 2 +-
whups/ticket/delete.php | 2 +-
whups/ticket/queue.php | 6 +-
whups/ticket/type.php | 4 +-
whups/ticket/update.php | 2 +-
whups/ticket/watch.php | 4 +-
120 files changed, 378 insertions(+), 177 deletions(-)
http://git.horde.org/horde-git/-/commit/285f1aaecd7b32a0e45b74896f5f4adf7b49e70b
More information about the commits
mailing list