[commits] Horde branch develop updated. a3532203258d1711f939ac0b17c5a4bdcec2aef3
Michael J. Rubinsky
mrubinsk at horde.org
Mon Jan 2 01:35:16 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 285f1aaecd7b32a0e45b74896f5f4adf7b49e70b
ad62c22 Don't mix translated/untranslated strings (Bug #10890).
d442797 Avoid undefined variable errors.
94b9b8f Fix URLs in sub-directories.
f4b2170 Fix carousel display on legacy uploader.
942dbac More appropriate method name.
e439e22 BFN
c04fb40 Fix setting the gallery view_mode from outside the object.
54fd9cf ws
bd32bce Force Normal mode when previewing all the gallery's images.
6b88c9a Fix building SQL query.
d907c88 ws
17216ad Fix remote wipe for iOS.
7d7d56f Fix remote wipe initiation on some android devices.
84ff252 BFN
2eac1f0 Need to cleanup after initial android pairing in PROVISION handling as well.
71b468a Remove redundant check
6aff844 Trim some unused code.
8fed8ee simplify
e5b2cea typo
e4108de Fix usage of $hint parameter.
a353220 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit ad62c2226e3c565f47d19e4e8fa2bb14178597eb
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 29 11:19:33 2011 +0100
Don't mix translated/untranslated strings (Bug #10890).
framework/Core/lib/Horde/Registry.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ad62c2226e3c565f47d19e4e8fa2bb14178597eb
-----------------------------------------------------------------------
commit d442797fbef7cf99fcc3aaf087895402e06857af
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 12:28:28 2011 -0500
Avoid undefined variable errors.
framework/Image/lib/Horde/Image/Exif/Exiftool.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/d442797fbef7cf99fcc3aaf087895402e06857af
-----------------------------------------------------------------------
commit 94b9b8f23e652ead168a71a319be606cff369a67
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 29 19:19:04 2011 +0100
Fix URLs in sub-directories.
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 +-
ansel/gallery/sort.php | 2 +-
ansel/img/ecard.php | 2 +-
ansel/templates/image/upload.inc | 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 +-
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 +-
mnemo/notepads/create.php | 2 +-
mnemo/notepads/delete.php | 2 +-
mnemo/notepads/edit.php | 2 +-
nag/tasklists/create.php | 2 +-
nag/tasklists/delete.php | 2 +-
nag/tasklists/edit.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/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 ++--
53 files changed, 57 insertions(+), 57 deletions(-)
http://git.horde.org/horde-git/-/commit/94b9b8f23e652ead168a71a319be606cff369a67
-----------------------------------------------------------------------
commit f4b21701457742a537054d72929fcd89ca9fc46e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:02:47 2011 -0500
Fix carousel display on legacy uploader.
ansel/lib/View/Upload.php | 112 ++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 37 deletions(-)
http://git.horde.org/horde-git/-/commit/f4b21701457742a537054d72929fcd89ca9fc46e
-----------------------------------------------------------------------
commit 942dbac9e5e873dec67240f6f7b3a68d1355ec77
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:04:32 2011 -0500
More appropriate method name.
ansel/img/upload.php | 2 +-
ansel/lib/View/Upload.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/942dbac9e5e873dec67240f6f7b3a68d1355ec77
-----------------------------------------------------------------------
commit e439e22d063290f98d8b9f3e98d13479742835e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:05:28 2011 -0500
BFN
ansel/docs/CHANGES | 1 +
ansel/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/e439e22d063290f98d8b9f3e98d13479742835e3
-----------------------------------------------------------------------
commit c04fb4053930aa89874bc256b3bdd25abe6da07f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:23:46 2011 -0500
Fix setting the gallery view_mode from outside the object.
ansel/lib/Gallery.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/c04fb4053930aa89874bc256b3bdd25abe6da07f
-----------------------------------------------------------------------
commit 54fd9cfcd4c8711e25d3879cc372b972b234ffad
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:24:17 2011 -0500
ws
ansel/lib/View/Upload.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/54fd9cfcd4c8711e25d3879cc372b972b234ffad
-----------------------------------------------------------------------
commit bd32bce7a1cd84748473b8ade4cacf6076c6a74c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 29 14:25:00 2011 -0500
Force Normal mode when previewing all the gallery's images.
Avoids problems with auto-navigation down to day level pages.
ansel/img/upload_preview.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/bd32bce7a1cd84748473b8ade4cacf6076c6a74c
-----------------------------------------------------------------------
commit 6b88c9aff16bd4e213308339a518ccf9bc15ae37
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 15:30:49 2012 -0500
Fix building SQL query.
Don't concantenate.
framework/ActiveSync/lib/Horde/ActiveSync/State/History.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/6b88c9aff16bd4e213308339a518ccf9bc15ae37
-----------------------------------------------------------------------
commit d907c8804a7eb541b9d11cefb11dd9a25c701eed
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 15:31:17 2012 -0500
ws
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/d907c8804a7eb541b9d11cefb11dd9a25c701eed
-----------------------------------------------------------------------
commit 17216ad38575e944031a1de765ee41095d336638
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 19:53:51 2012 -0500
Fix remote wipe for iOS.
iOS now seems to send broken wbxml for a REMOTEWIPE ack. Account for this.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 24 ++++--
1 files changed, 16 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/17216ad38575e944031a1de765ee41095d336638
-----------------------------------------------------------------------
commit 7d7d56f099f8fa1cdd9affc8acc868691674d4d2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 19:56:15 2012 -0500
Fix remote wipe initiation on some android devices.
According to the AOSP source code, the sync manager looks for the
policy data before it checks for REMOTEWIPE, so if the policy data
is not sent, the device will NEVER ack. the REMOTEWIPE.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 49 +++----
1 files changed, 24 insertions(+), 25 deletions(-)
http://git.horde.org/horde-git/-/commit/7d7d56f099f8fa1cdd9affc8acc868691674d4d2
-----------------------------------------------------------------------
commit 84ff252bcf74f3304e6fb7965b7df1355ff4cb17
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 19:59:07 2012 -0500
BFN
framework/ActiveSync/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/84ff252bcf74f3304e6fb7965b7df1355ff4cb17
-----------------------------------------------------------------------
commit 2eac1f0f02b022ff01dae007e705e5f1fe47177e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 20:18:13 2012 -0500
Need to cleanup after initial android pairing in PROVISION handling as well.
Now that android can be provisioned, need to check for android's bogus
'validate' device, and remove it.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 18 ++++++
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 9 +---
framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 1 +
3 files changed, 20 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/2eac1f0f02b022ff01dae007e705e5f1fe47177e
-----------------------------------------------------------------------
commit 71b468a2a7fa3c1ff7c9adef90bfcf30b8398df5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 25 15:31:49 2011 -0500
Remove redundant check
framework/ActiveSync/lib/Horde/ActiveSync/State/History.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/71b468a2a7fa3c1ff7c9adef90bfcf30b8398df5
-----------------------------------------------------------------------
commit 6aff8443ab8476f18958452aeb345aae9bdcb7ca
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 25 16:08:02 2011 -0500
Trim some unused code.
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 9 ------
1 files changed, 0 insertions(+), 9 deletions(-)
http://git.horde.org/horde-git/-/commit/6aff8443ab8476f18958452aeb345aae9bdcb7ca
-----------------------------------------------------------------------
commit 8fed8ee586d720bfd8bd06d7c36387bfbb65512b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Dec 28 20:11:20 2011 -0500
simplify
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/8fed8ee586d720bfd8bd06d7c36387bfbb65512b
-----------------------------------------------------------------------
commit e5b2cea8c310a35059b36326cdb3eaa46128a427
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Dec 28 22:28:23 2011 -0500
typo
.../Horde/ActiveSync/2_horde_activesync_peruserpolicykey.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e5b2cea8c310a35059b36326cdb3eaa46128a427
-----------------------------------------------------------------------
commit e4108def0941e5935869eac016675515d0c032ae
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 11:25:04 2012 -0500
Fix usage of $hint parameter.
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/e4108def0941e5935869eac016675515d0c032ae
-----------------------------------------------------------------------
commit a3532203258d1711f939ac0b17c5a4bdcec2aef3
Merge: 285f1aa e4108de
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Jan 1 20:34:59 2012 -0500
Merge branch 'master' into develop
Conflicts:
ansel/package.xml
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 +-
ansel/docs/CHANGES | 1 +
ansel/gallery/sort.php | 2 +-
ansel/img/ecard.php | 2 +-
ansel/img/upload.php | 2 +-
ansel/img/upload_preview.php | 3 +
ansel/lib/Gallery.php | 9 +-
ansel/lib/View/Upload.php | 113 +++--
ansel/package.xml | 1 +
ansel/templates/image/upload.inc | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 20 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 18 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 74 ++--
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 9 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/History.php | 8 +-
.../Horde/ActiveSync/2_horde_activesync_peruserpolicykey.php | 2 +-
framework/ActiveSync/package.xml | 4 +-
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 11 +-
framework/Core/lib/Horde/Registry.php | 2 +-
framework/Image/lib/Horde/Image/Exif/Exiftool.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 +-
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 +-
mnemo/notepads/create.php | 2 +-
mnemo/notepads/delete.php | 2 +-
mnemo/notepads/edit.php | 2 +-
nag/tasklists/create.php | 2 +-
nag/tasklists/delete.php | 2 +-
nag/tasklists/edit.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/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 +-
69 files changed, 220 insertions(+), 173 deletions(-)
http://git.horde.org/horde-git/-/commit/a3532203258d1711f939ac0b17c5a4bdcec2aef3
More information about the commits
mailing list