[commits] Horde branch master updated. f4929a87ebdd18109669bf3f23b5e173603a45a5
Michael J. Rubinsky
mrubinsk at horde.org
Fri May 13 17:57:05 UTC 2011
The branch "master" has been updated.
The following is a summary of the commits.
from: e7a93ed9b2ec51950fdc74648b62915e0ca02018
5407106 Refactor Ansel for H4:
78c6c62 parse error
f4929a8 parse error
-----------------------------------------------------------------------
commit 540710601ccf3cff029fe27d10876eb7c62f6cb6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:51:18 2011 -0400
Refactor Ansel for H4:
This is a fairly big change, lots of testing encouraged!
Compose Horde_Share_Object with Ansel_Gallery
instead of extending it so any H4 share driver can
now be used.
Use Horde_Db
Bunch of other stuff :)
Squashed commit of the following:
commit f75e20be1234bc8fea9f354d6e00b7b843dbbc8e
Merge: f9eea1f e7a93ed
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:43:16 2011 -0400
Merge branch 'master' into ansel_sharesng
Conflicts:
framework/Share/package.xml
commit f9eea1f5c6e52d40c128f94c6e16ac38685ac6bf
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:31:17 2011 -0400
Horde_Db
commit 605ae7369562a8ea2b8e9169541d75a5c7a9597c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:17:27 2011 -0400
use the globally configured share driver
commit 09791ccc5fc7e729b29f8519dd3e8a34946d5cae
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:17:07 2011 -0400
initial data migration for sqlng
commit db2452d86d2a89ed2e0e4564369172e2ac12750c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:09:21 2011 -0400
Fix a number of issues with sqlng and sql driver
- getShareCriteria() should be protected
- return value of Horde_Share_Sql::_getShareCriteria is not compatible
with Horde_Share_Sqlng::, and $perms need to be an array instead of bitmask
so need to also override countOwners() and
listOwners() in the sqlng driver.
commit c2c7c382ccd257ea097040070fcd639be071d0d0
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 11:49:37 2011 -0400
Don't tag item if the tag is empty.
commit 4a4fdcc7e8d2583682ad43b11250bc1a9965ca4e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 11:35:57 2011 -0400
more ->getId() -> id fixes, fix adding default perms to new galleries
commit fc4f065fd5655bcd9fa505d09bcb8281907f41e9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:59:56 2011 -0400
Fix setting gallery permissions
commit 4a775d42e78df59e6661a7b92cdf388679f052b6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:58:53 2011 -0400
ws
commit 8d820dca3b36b8a2c2aef752c0c2138c4b59eee9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:14:28 2011 -0400
fix property name
commit d3bbc0aaf13dd98f006a76ea3080fcb24be1f547
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:13:17 2011 -0400
fix variable name, ws.
commit 62a644801b391a3d5215116b428669bd146c486a
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:12:30 2011 -0400
Need to make sure that ::widgets is populated correctly.
commit 10681ff90a1254be80fb14664e3c7734dffeab5c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:11:39 2011 -0400
Ansel_Gallery needs a getChildren method now that it doesn't extend Horde_Share_Object
commit 3fe78fa362c85950d071c5ab730e6b1279e90975
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 10:10:10 2011 -0400
galleryShare hasn't been used for quite some time. Remove it.
commit aff40353b3108f21355297b4aff0800faccc4665
Merge: 1053879 1d7a5fd
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 09:19:57 2011 -0400
Merge branch 'master' into ansel_sharesng
Conflicts:
turba/package.xml
commit 10538792730fcd54406a37fff8f442f01e003c75
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 09:32:23 2011 -0400
Ansel_Gallery needs a setPermission() too
commit 917b204f44454270fe7bcf5d1eea4b79eaf4f051
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 09:31:38 2011 -0400
another ->getId() => ->id
commit f8bf508a1d3cdcfbb00f2aa27dac064538dec5ad
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 09:31:08 2011 -0400
This is autoincrement, don't attempt to insert and image_id
commit a553b58953e1faf1ea6639852086b853fdb28763
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:38:43 2011 -0400
Fix Ansel_Gallery#set - still not quite right yet.
commit 889ae5052791cbe2a3765f8154f1fe858c4b9407
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:38:25 2011 -0400
properly pass a style
commit 874e99e8463ed81d212435b79b4f1587d863482f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:38:02 2011 -0400
typo
commit 0dd603855008d15399ed1c56d4761bc1731bc283
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:37:46 2011 -0400
autoloaded
commit 1ce1f74f0aa6f57c7dd42f836ddef677caab3b43
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:03:32 2011 -0400
$gallery->data['attribute_property_name'] -> $gallery->get('property_name')
commit 410261ee8cf672483c6eb8513410d467e94b76fa
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Tue May 10 00:02:38 2011 -0400
Readd the Action widget, got removed somewhere along the way.
commit 6898a3f13cd6a7b16c81010b849637d29742f346
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 20:16:32 2011 -0400
standardize/fix Ansel_Gallery vs Horde_Share_Object vs ids
commit f3c0d4510791a9e0f6abd3124de689d8ec39764e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 20:15:22 2011 -0400
Work around issues with __get() and arrays, while avoiding reference warnings
commit 189f63535c645ef2d8832f5b41ba0e47695b74cc
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 17:03:28 2011 -0400
Horde_Db cannot support blob/text indexes at this time
commit c9aad057ecd6d021b4ec13d4c82b93810f0b9f8b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 17:03:06 2011 -0400
Throw exception if shareOb cannot be obtained
commit 64d45d059b160cecf4ce627e98951d21e69fcd3b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 13:44:17 2011 -0400
Fix images property access
commit 7670a409472e6a6fe8536dc0f4e3f7e8acde2324
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 13:36:55 2011 -0400
remove debug code
commit 8bb37b86eee5e9202e110119182334e9fa86751c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 13:36:31 2011 -0400
fix query for image data
commit 13c5d581358461bde5b727ee2663adf88851e432
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 13:36:13 2011 -0400
catch cache version change
commit 26e06c26702d2f0aff0a41ea359595a7d15c6492
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Mon May 9 12:51:38 2011 -0400
first round of share refactorings
commit d874b69f5f2116afb7e3c6d7ce57dfa97a940a24
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 6 00:43:15 2011 -0400
fix method signature
commit e8eeb489fdf1e5488714b8a5c2be3925e4db7935
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 6 00:32:08 2011 -0400
parse error
commit 00c962f72066c9971f1831117d4f15ae4056687a
Merge: 4f294dc cea4c8d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 6 00:28:54 2011 -0400
Merge branch 'master' into ansel_sharesng
Conflicts:
framework/Share/package.xml
horde/lib/Application.php
horde/package.xml
imp/lib/Application.php
imp/package.xml
kronolith/lib/Application.php
kronolith/package.xml
mnemo/package.xml
nag/lib/Application.php
nag/package.xml
turba/lib/Application.php
turba/package.xml
commit 4f294dcbec48e177f0d306a348a1e2cb94cdb53c
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 23 20:28:43 2011 -0400
Don't let a broken date value totally break activesync session.
Possibly fixes one part of Bug: 9837
commit 22f2f1030bd134273f0070cac32d62c540372196
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 21 16:26:14 2011 -0400
bump version
commit fd927e0a1c8b1532b07046ea7a70b30bdfd65c32
Merge: 8ed94b4 dc03419
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 21 16:20:35 2011 -0400
Merge branch 'develop' into ansel_sharesng
Conflicts:
imp/package.xml
commit 8ed94b461169b4c2c89728e585b1517b828de9af
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 21 14:44:33 2011 -0400
Add ability to immediatley save the change when calling Horde_Share_Object#set
Implemented in the sql drivers, but was unsure how to implment this in kolab.
For now, it just calls _save() there.
commit f92f4fb0894786415472a7da5f830a859a1692d9
Merge: 6724680 e84667a
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 21 14:34:35 2011 -0400
Merge branch 'master' into ansel_sharesng
commit dc03419d7d329bbc1a5b598155af7b355cd37ddb
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 21 19:00:49 2011 +0200
Bump API versions too.
commit 206ff72dbee119a1f1f473d83627357fdb9d7f6d
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 21 18:55:21 2011 +0200
Bump versions.
commit 6724680553937c02d0e838df2eb876b9c31dcf2d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 21 11:04:21 2011 -0400
initial sharesng migration. just creates tables
ansel/image.php | 12 +-
ansel/js/slideshow.js | 10 +-
ansel/lib/Ansel.php | 37 +--
ansel/lib/Api.php | 22 +-
ansel/lib/Block/Gallery.php | 1 -
ansel/lib/Block/RecentComments.php | 2 +-
ansel/lib/Block/RecentlyAdded.php | 2 +-
ansel/lib/Faces.php | 30 ++-
ansel/lib/Faces/Base.php | 60 ++---
ansel/lib/Factory/Storage.php | 2 +-
ansel/lib/Gallery.php | 446 ++++++++++++++++++-----------
ansel/lib/GalleryMode/Date.php | 14 +-
ansel/lib/GalleryMode/Normal.php | 20 +-
ansel/lib/ImageGenerator.php | 7 +-
ansel/lib/Storage.php | 374 +++++++++++-------------
ansel/lib/Style.php | 26 ++-
ansel/lib/View/Gallery.php | 1 -
ansel/lib/View/GalleryProperties.php | 15 +-
ansel/lib/View/GalleryRenderer/Base.php | 2 +
ansel/lib/View/Results.php | 2 +-
ansel/lib/View/Upload.php | 2 +-
ansel/lib/Widget/Base.php | 3 +
ansel/migration/9_ansel_upgrade_sqlng.php | 198 +++++++++++++
ansel/perms.php | 29 +-
ansel/scripts/ansel.php | 6 +-
ansel/scripts/recursive_import.php | 6 +-
ansel/scripts/remote_import.php | 4 +-
ansel/templates/view/slideshow.inc | 2 +-
28 files changed, 804 insertions(+), 531 deletions(-)
create mode 100644 ansel/migration/9_ansel_upgrade_sqlng.php
http://git.horde.org/horde-git/-/commit/540710601ccf3cff029fe27d10876eb7c62f6cb6
-----------------------------------------------------------------------
commit 78c6c62acee4e35021bd4b28607015410db4fab9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:55:29 2011 -0400
parse error
ansel/lib/Faces/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/78c6c62acee4e35021bd4b28607015410db4fab9
-----------------------------------------------------------------------
commit f4929a87ebdd18109669bf3f23b5e173603a45a5
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date: Fri May 13 13:56:50 2011 -0400
parse error
ansel/lib/GalleryMode/Date.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/f4929a87ebdd18109669bf3f23b5e173603a45a5
More information about the commits
mailing list