[commits] Horde branch master updated. 91531820ed428b5f58574be49ce3d05688555a3a
Michael J. Rubinsky
mrubinsk at horde.org
Sat Apr 11 20:59:28 UTC 2015
The branch "master" has been updated.
The following is a summary of the commits.
from: 44877fa8e8494a42d48d18384ca6be7f51c6cf1d
d48b608 First step on the path for converting Kronolith resources to shares.
8a786c9 This is no longer a SQL driver now that we use shares.
13c52d1 Update configuration switch for resources.
2fce18f phpdoc
f976776 Start process of migrating existing resources.
24e5862 Use the existing calendar id as the share name.
2962954 Default perms when migrating resources.
a4cc99f This is already handled in another case.
290b9fb Finish resource group support for share implementation.
831a022 Fix application scope.
54e566b Implement setting/editing perms for resources.
4e3e59b Fix checking for resource_management perms.
83b98b3 Update UPGRADING.
ee98446 Merge branch 'kronolith-resource-to-shares'
fc24bf0 CHANGES
9153182 Update package.xml filelist.
Summary: http://github.com/horde/horde/compare/44877fa8e8494a42d48d18384ca6be7f51c6cf1d...91531820ed428b5f58574be49ce3d05688555a3a
-----------------------------------------------------------------------
commit d48b608a4d873a5997b640e1cc8fc58424de1f86
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Apr 6 15:51:46 2015 -0400
First step on the path for converting Kronolith resources to shares.
Basic functionality works for Single resources (Groups are still @todo).
Still needs upgrade task or migration for converting existing
resoruces and permissions interface/checking is still @todo.
kronolith/lib/Ajax/Application/Handler.php | 10 +-
kronolith/lib/Calendar/Resource.php | 2 +-
kronolith/lib/Calendar/ResourceGroup.php | 2 +-
kronolith/lib/Driver/Resource/Sql.php | 169 ++------
kronolith/lib/Kronolith.php | 4 +
kronolith/lib/Resource.php | 35 ++-
kronolith/lib/Resource/Base.php | 80 ++--
kronolith/lib/Resource/Group.php | 2 +
kronolith/lib/Resource/Single.php | 35 ++
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 51 +++
kronolith/package.xml | 10 +-
kronolith/templates/chunks/calendar.php | 4 +-
12 files changed, 218 insertions(+), 186 deletions(-)
create mode 100644 kronolith/migration/24_kronolith_upgrade_resourcestoshares.php
http://github.com/horde/horde/commit/d48b608a4d873a5997b640e1cc8fc58424de1f86
-----------------------------------------------------------------------
commit 8a786c91f0ad5bfb36163255e9946ae08cf30eeb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Apr 7 21:00:07 2015 -0400
This is no longer a SQL driver now that we use shares.
kronolith/lib/Driver/Resource.php | 450 +++++++++++++++++++++++++++++++
kronolith/lib/Driver/Resource/Sql.php | 472 ---------------------------------
kronolith/lib/Event/Resource.php | 104 +++++++
kronolith/lib/Event/Resource/Sql.php | 104 -------
4 files changed, 554 insertions(+), 576 deletions(-)
create mode 100644 kronolith/lib/Driver/Resource.php
delete mode 100644 kronolith/lib/Driver/Resource/Sql.php
create mode 100644 kronolith/lib/Event/Resource.php
delete mode 100644 kronolith/lib/Event/Resource/Sql.php
http://github.com/horde/horde/commit/8a786c91f0ad5bfb36163255e9946ae08cf30eeb
-----------------------------------------------------------------------
commit 13c52d15afcaa7c97aef9151dde9d005fece653d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Apr 7 21:02:29 2015 -0400
Update configuration switch for resources.
kronolith/attendees.php | 2 +-
kronolith/config/conf.xml | 17 ++++-------------
kronolith/lib/Ajax.php | 2 +-
kronolith/lib/Ajax/Application/Handler.php | 4 ++--
kronolith/lib/Application.php | 2 +-
kronolith/lib/CalendarsManager.php | 2 +-
kronolith/lib/Factory/Driver.php | 14 +++-----------
kronolith/lib/Kronolith.php | 4 ++--
kronolith/lib/View/Sidebar.php | 2 +-
kronolith/package.xml | 16 ++++++----------
kronolith/templates/attendees/attendees.inc | 4 ++--
kronolith/templates/chunks/calendar.php | 4 ++--
kronolith/templates/dynamic/edit.inc | 2 +-
13 files changed, 27 insertions(+), 48 deletions(-)
http://github.com/horde/horde/commit/13c52d15afcaa7c97aef9151dde9d005fece653d
-----------------------------------------------------------------------
commit 2fce18fd687ee20bf0e4bf683a90e97f46dfcba5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Apr 7 21:52:44 2015 -0400
phpdoc
kronolith/lib/Resource.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/2fce18fd687ee20bf0e4bf683a90e97f46dfcba5
-----------------------------------------------------------------------
commit f97677693baadaac47e0219fba28266faf82be02
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Apr 7 21:52:58 2015 -0400
Start process of migrating existing resources.
Still need to work out ownership and perms.
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 46 ++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/f97677693baadaac47e0219fba28266faf82be02
-----------------------------------------------------------------------
commit 24e5862ed2f0cde13b0006df7f2f0a1ddfadde88
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Apr 10 10:00:14 2015 -0400
Use the existing calendar id as the share name.
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/24e5862ed2f0cde13b0006df7f2f0a1ddfadde88
-----------------------------------------------------------------------
commit 2962954d1ec40548e442b7b2636485fc8322db8c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Apr 10 10:00:31 2015 -0400
Default perms when migrating resources.
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/2962954d1ec40548e442b7b2636485fc8322db8c
-----------------------------------------------------------------------
commit a4cc99f8f25bdd4f5b158253856628829f712756
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Apr 10 10:18:47 2015 -0400
This is already handled in another case.
kronolith/lib/Ajax/Application/Handler.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/a4cc99f8f25bdd4f5b158253856628829f712756
-----------------------------------------------------------------------
commit 290b9fbf051e854fffa4b24e3b1b1b32c3995691
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Apr 10 13:56:44 2015 -0400
Finish resource group support for share implementation.
Also, fix and simplify a bunch of other resource related stuff.
kronolith/lib/Ajax/Application/Handler.php | 26 +-
kronolith/lib/Application.php | 2 +-
kronolith/lib/CalendarsManager.php | 2 +-
kronolith/lib/Driver/Resource.php | 10 +-
kronolith/lib/Event.php | 1 +
kronolith/lib/Factory/Driver.php | 3 +
kronolith/lib/Factory/Shares.php | 4 +-
kronolith/lib/Form/CreateResource.php | 2 +-
kronolith/lib/Form/CreateResourceGroup.php | 2 +-
kronolith/lib/Form/EditResource.php | 2 +-
kronolith/lib/Form/EditResourceGroup.php | 2 +-
kronolith/lib/Kronolith.php | 2 +-
kronolith/lib/Resource.php | 26 ++-
kronolith/lib/Resource/Base.php | 28 +--
kronolith/lib/Resource/Group.php | 2 +-
kronolith/lib/Resource/Single.php | 15 --
kronolith/lib/Shares.php | 97 ++++++++
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 11 +-
kronolith/templates/chunks/calendar.php | 2 +-
19 files changed, 161 insertions(+), 78 deletions(-)
create mode 100644 kronolith/lib/Shares.php
http://github.com/horde/horde/commit/290b9fbf051e854fffa4b24e3b1b1b32c3995691
-----------------------------------------------------------------------
commit 831a02286aad4e27d0da5d5dd6f46fbaa9e1e41f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:46:40 2015 -0400
Fix application scope.
kronolith/lib/Factory/Shares.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/831a02286aad4e27d0da5d5dd6f46fbaa9e1e41f
-----------------------------------------------------------------------
commit 54e566be700e005ae1582e128c913d7119d14c61
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:48:57 2015 -0400
Implement setting/editing perms for resources.
Only "resource admins" can add resources or edit perms.
kronolith/js/kronolith.js | 34 ++++++++++++------
kronolith/lib/Ajax/Application/Handler.php | 3 ++
kronolith/lib/Calendar/Resource.php | 6 +---
kronolith/lib/Kronolith.php | 51 +++++++++++++++-------------
kronolith/templates/chunks/calendar.php | 6 +++
kronolith/templates/chunks/permissions.inc | 10 +++---
6 files changed, 64 insertions(+), 46 deletions(-)
http://github.com/horde/horde/commit/54e566be700e005ae1582e128c913d7119d14c61
-----------------------------------------------------------------------
commit 4e3e59bcc9bcc9a7e281bff8890f30a04469b14d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:49:42 2015 -0400
Fix checking for resource_management perms.
kronolith/lib/Calendar/Resource.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/4e3e59bcc9bcc9a7e281bff8890f30a04469b14d
-----------------------------------------------------------------------
commit 83b98b3137fe19fb9a1171d5da835ddb4680b48b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:56:03 2015 -0400
Update UPGRADING.
kronolith/docs/UPGRADING | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/83b98b3137fe19fb9a1171d5da835ddb4680b48b
-----------------------------------------------------------------------
commit ee98446782cc8841c276953c6c676ef5a97658f6
Merge: 44877fa 83b98b3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:56:42 2015 -0400
Merge branch 'kronolith-resource-to-shares'
kronolith/attendees.php | 2 +-
kronolith/config/conf.xml | 17 +-
kronolith/docs/UPGRADING | 3 +
kronolith/js/kronolith.js | 34 +-
kronolith/lib/Ajax.php | 2 +-
kronolith/lib/Ajax/Application/Handler.php | 42 +-
kronolith/lib/Application.php | 4 +-
kronolith/lib/Calendar/Resource.php | 10 +-
kronolith/lib/Calendar/ResourceGroup.php | 2 +-
kronolith/lib/CalendarsManager.php | 4 +-
kronolith/lib/Driver/Resource.php | 452 ++++++
kronolith/lib/Driver/Resource/Sql.php | 569 --------
kronolith/lib/Event.php | 1 +
kronolith/lib/Event/Resource.php | 104 ++
kronolith/lib/Event/Resource/Sql.php | 104 --
kronolith/lib/Factory/Driver.php | 17 +-
kronolith/lib/Factory/Shares.php | 4 +-
kronolith/lib/Form/CreateResource.php | 2 +-
kronolith/lib/Form/CreateResourceGroup.php | 2 +-
kronolith/lib/Form/EditResource.php | 2 +-
kronolith/lib/Form/EditResourceGroup.php | 2 +-
kronolith/lib/Kronolith.php | 59 +-
kronolith/lib/Resource.php | 53 +-
kronolith/lib/Resource/Base.php | 72 +-
kronolith/lib/Resource/Group.php | 4 +-
kronolith/lib/Resource/Single.php | 20 +
kronolith/lib/Shares.php | 97 ++
kronolith/lib/View/Sidebar.php | 2 +-
kronolith/migration/24_kronolith_upgrade_resourcestoshares.php | 104 ++
kronolith/package.xml | 22 +-
kronolith/templates/attendees/attendees.inc | 4 +-
kronolith/templates/chunks/calendar.php | 16 +-
kronolith/templates/chunks/permissions.inc | 10 +-
kronolith/templates/dynamic/edit.inc | 2 +-
34 files changed, 996 insertions(+), 848 deletions(-)
http://github.com/horde/horde/commit/ee98446782cc8841c276953c6c676ef5a97658f6
-----------------------------------------------------------------------
commit fc24bf0e73445851c1b3a2361cf579ab4498b4b4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:58:22 2015 -0400
CHANGES
kronolith/docs/CHANGES | 1 +
kronolith/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/fc24bf0e73445851c1b3a2361cf579ab4498b4b4
-----------------------------------------------------------------------
commit 91531820ed428b5f58574be49ce3d05688555a3a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Apr 11 16:58:51 2015 -0400
Update package.xml filelist.
kronolith/package.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/91531820ed428b5f58574be49ce3d05688555a3a
More information about the commits
mailing list