[Pkg-owncloud-commits] [php-sabredav] 81/275: Merge branch 'calendar-auto-schedule' of github.com:fruux/sabre-dav into calendar-auto-schedule

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit f9bdcdb784c78117a32dd33babf0a570de59195e
Merge: 63e32d5 5dfdf05
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 2 20:53:35 2014 -0400

    Merge branch 'calendar-auto-schedule' of github.com:fruux/sabre-dav into calendar-auto-schedule
    
    Conflicts:
    	bin/migrateto21.php

 ChangeLog.md                                       | 27 ++++++++
 README.md                                          |  1 +
 bin/build.php                                      | 35 +++++++++-
 bin/migrateto21.php                                |  1 -
 composer.json                                      |  3 +-
 examples/sql/pgsql.addressbook.sql                 | 23 ++++++-
 examples/sql/pgsql.calendars.sql                   | 26 ++++++--
 examples/sql/pgsql.locks.sql                       | 12 +++-
 examples/sql/pgsql.principals.sql                  |  2 +-
 examples/sql/pgsql.propertystorage.sql             | 12 ++++
 examples/sql/pgsql.users.sql                       |  3 +-
 .../CalDAV/Backend/SchedulingSupport.php           |  0
 .../CalDAV/ICalendarObjectContainer.php            |  0
 lib/{Sabre => }/CalDAV/Schedule/IInbox.php         |  0
 lib/{Sabre => }/CalDAV/Schedule/ITipMessage.php    |  0
 lib/{Sabre => }/CalDAV/Schedule/Inbox.php          |  0
 lib/{Sabre => }/CalDAV/Schedule/Plugin.php         | 76 +++++++++-------------
 .../CalDAV/Schedule/SchedulingObject.php           |  0
 lib/DAV/CorePlugin.php                             |  7 ++
 lib/DAV/PropFind.php                               |  2 +
 .../PropertyStorage/Backend/BackendInterface.php   | 13 ++++
 lib/DAV/PropertyStorage/Backend/PDO.php            | 38 +++++++++++
 lib/DAV/PropertyStorage/Plugin.php                 | 24 ++++++-
 lib/DAV/Server.php                                 |  4 +-
 lib/DAV/Version.php                                |  2 +-
 tests/Sabre/DAV/PropFindTest.php                   |  9 ---
 .../PropertyStorage/Backend/AbstractPDOTest.php    | 34 ++++++++++
 tests/Sabre/DAV/PropertyStorage/Backend/Mock.php   | 30 +++++++++
 tests/Sabre/DAV/ServerPropsTest.php                | 38 ++++++++---
 29 files changed, 336 insertions(+), 86 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git