Merge branch 'dev/sabredav2'
8f79e138a62d
Actions

Description

Merge branch 'dev/sabredav2'

Conflicts:
composer.json
lib/Kolab/CalDAV/Plugin.php
lib/Kolab/CardDAV/ContactsBackend.php
lib/Kolab/Utils/DAVBackend.php
public_html/index.php

Resolves: T52

Details

Provenance

bruederli	Authored on
bruederli	Pushed on Apr 27 2015, 9:47 AM

Parents

rI4f4502b93792: Fix HTTP response logging with new Sabre VObject 3 classes
rI164601910198: Update git repository url

Branches

Unknown

Tags

Unknown

Build Status

Buildable 301
Build 302: Continuous Integration for Software Development Projects

Event Timeline

bruederli committed rI8f79e138a62d: Merge branch 'dev/sabredav2' (authored by bruederli).Apr 27 2015, 9:30 AM

Harbormaster completed building B301: rI8f79e138a62d: Merge branch 'dev/sabredav2'.Apr 27 2015, 9:47 AM

bruederli mentioned this in T52: Merge dev/sabredav2 in to master.Apr 27 2015, 10:04 AM

Merged Changes

4f4502b93792 Fix HTTP response logging with new Sabre VObject 3 classes
Author
bruederli
Browse Repository
Passed
No Audits
75528bcc0e08 Update git repository url
Author
bruederli
Browse Repository
Passed
No Audits
d20afc782222 Fix photo encoding according to tests
Author
bruederli
Browse Repository
No Builds
Concern Raised
f64cb42bf29b Remove duplicate import after rebase
Author
bruederli
Browse Repository
No Builds
No Audits
fadd7b1e247c Fix small typo
Author
bruederli
Browse Repository
No Builds
No Audits
174a889771c9 Minor fixes after rebase and library updates
Author
bruederli
Browse Repository
No Builds
No Audits
2069f1fbc9eb More changes for the new SabreDAV 2.1 API; added basic scheduling support…
Author
bruederli
Browse Repository
No Builds
No Audits
ce6d76cfcdc5 Adapt to API changes for SabreDAV 2.1 / VObject 3.3
Author
bruederli
Browse Repository
No Builds
No Audits
00e6993c1782 Fix type parameter parsing and mapping (#4955)
Author
bruederli
Browse Repository
No Builds
No Audits
04a9f9b7ffd4 WebDAV: Check for storage errors and throw the according exceptions (#4406)
Author
machniak
Browse Repository
No Builds
No Audits
57a739a71c67 Check for storage errors and throw the according exceptions (#4406)
Author
bruederli
Browse Repository
No Builds
No Audits
6c947ece4a3a Handle resources with multiple occurrences of the same event according to RFC…
Author
bruederli
Browse Repository
No Builds
No Audits
c0d2a974219a Fix HTTP raw logging in non-apache environments (#4128). Patch by Daniel Hoffend
Author
bruederli
Browse Repository
No Builds
No Audits
35ad7d74422c Add alternative composer.json file for packaging.
Author
bruederli
Browse Repository
No Builds
No Audits
0e0982f51174 Correctly set folder type according to the submitted supported-calendar…
Author
bruederli
Browse Repository
No Builds
No Audits
db8872ce75fc Implement scheduling inobx feature by searching iTip messages in the user's…
Author
bruederli
Browse Repository
No Builds
No Audits
edb52eb167d1 Test Location: header after event creation where URI doesn't match the event UID
Author
bruederli
Browse Repository
No Builds
No Audits
7ac7888af845 Store some kolab_auth session vars in auth cache (iRony does not use sessions)
Author
bruederli
Browse Repository
No Builds
No Audits
ca1b3f806473 Add tests for schedule inbox properties
Author
bruederli
Browse Repository
No Builds
No Audits
d6113fa6d943 Implement the new Sabre\DAV\IProperties interface
Author
bruederli
Browse Repository
No Builds
No Audits
61335da91ef0 Make sure default calendar is listed as 'schedule-default-calendar-URL'
Author
bruederli
Browse Repository
No Builds
No Audits
ce796b49f1fc Don't search for current user principal
Author
bruederli
Browse Repository
No Builds
No Audits
c360eb260323 Implement principal searching (used by iCal autocompletion); check principal…
Author
bruederli
Browse Repository
No Builds
No Audits
b1da14092203 Minor adaption of test data to match new (but still valid) output
Author
bruederli
Browse Repository
No Builds
No Audits
ac39617203a6 Fix CardDAV outputs; optimize vcard conversion detection
Author
bruederli
Browse Repository
No Builds
No Audits
07655b6fde10 Fix listing of directory-gateway (aka LDAP address book)
Author
bruederli
Browse Repository
No Builds
No Audits
6e03dfa14336 Fix access to folder via their IMAP name
Author
bruederli
Browse Repository
No Builds
No Audits
ff8819d7809a More changes for the new SabreDAV 2.1 API; added basic scheduling support…
Author
bruederli
Browse Repository
No Builds
No Audits
81e59616f8d3 Fix logger callback + use new Scheduling classes and Sabre/HTTP lib for…
Author
bruederli
Browse Repository
No Builds
No Audits
1a73a594c9e8 No full vcard 4 conversion but photos should become uris
Author
bruederli
Browse Repository
No Builds
No Audits
f33d333b4588 Adapt to API changes for SabreDAV 2.1 / VObject 3.3
Author
bruederli
Browse Repository
No Builds
No Audits

Changes (42)

Path

Size

composer.json

config/

dav.inc.php.sample

lib/

Kolab/

CalDAV/

CardDAV/

DAV/

Auth/

DAVACL/

Utils/

	Utils/	HTTPResponse.php/
	DAV/	Auth/


	ServiceUnavailable.php

public_html/

index.php

test/

Resource/

CalDAV/

scheduleprops/

1.xml

CardDAV/

vcardput/

scripts/

tests/

CalDAV/

caldavIOP.xml

scheduleprops.xml

serverinfo.xml

rI8f79e138a62d

View Options

composer.json

View Options

config/dav.inc.php.sample

View Options

lib/Kolab/CalDAV/CalendarBackend.php

View Options

lib/Kolab/CalDAV/CalendarRootNode.php

View Options

lib/Kolab/CalDAV/IMip.php

View Options

lib/Kolab/CalDAV/IMipPlugin.php

View Options

lib/Kolab/CalDAV/Plugin.php

View Options

lib/Kolab/CalDAV/ScheduleInbox.php

View Options

lib/Kolab/CalDAV/SchedulePlugin.php

View Options

lib/Kolab/CalDAV/UserCalendars.php

View Options

lib/Kolab/CardDAV/ContactsBackend.php

View Options

lib/Kolab/CardDAV/LDAPDirectory.php

View Options

lib/Kolab/CardDAV/Plugin.php

View Options

lib/Kolab/CardDAV/UserAddressBooks.php

View Options

lib/Kolab/DAV/Auth/HTTPBasic.php

View Options

lib/Kolab/DAV/File.php

View Options

lib/Kolab/DAVACL/PrincipalBackend.php

View Options

lib/Kolab/Utils/DAVBackend.php

View Options

lib/Kolab/Utils/DAVLogger.php

View Options

lib/Kolab/Utils/HTTPResponse.php

View Options

lib/Kolab/Utils/VObjectUtils.php

View Options

public_html/index.php

View Options

test/Resource/CalDAV/scheduleprops/1.xml

View Options

test/Resource/CardDAV/vcardput/1.vcf

View Options

test/Resource/CardDAV/vcardput/10.vcf

View Options

test/Resource/CardDAV/vcardput/11.vcf

View Options

test/Resource/CardDAV/vcardput/12.vcf

View Options

test/Resource/CardDAV/vcardput/13.vcf

View Options

test/Resource/CardDAV/vcardput/14.vcf

View Options

test/Resource/CardDAV/vcardput/14a.vcf

View Options

test/Resource/CardDAV/vcardput/18.vcf

View Options

test/Resource/CardDAV/vcardput/2.vcf

View Options

test/Resource/CardDAV/vcardput/3.vcf

View Options

test/Resource/CardDAV/vcardput/5.vcf

View Options

test/Resource/CardDAV/vcardput/6.vcf

View Options

test/Resource/CardDAV/vcardput/8.vcf

View Options

test/Resource/CardDAV/vcardput/9.vcf

View Options

test/runtests.sh

View Options

test/scripts/tests/CalDAV/caldavIOP.xml

View Options

test/scripts/tests/CalDAV/scheduleprops.xml

View Options

Merge branch 'dev/sabredav2'8f79e138a62dActions

Description

Details

Event Timeline

Merged Changes

Changes (42)

rI8f79e138a62d

composer.json

config/dav.inc.php.sample

lib/Kolab/CalDAV/CalendarBackend.php

lib/Kolab/CalDAV/CalendarRootNode.php

lib/Kolab/CalDAV/IMip.php

lib/Kolab/CalDAV/IMipPlugin.php

lib/Kolab/CalDAV/Plugin.php

lib/Kolab/CalDAV/ScheduleInbox.php

lib/Kolab/CalDAV/SchedulePlugin.php

lib/Kolab/CalDAV/UserCalendars.php

lib/Kolab/CardDAV/ContactsBackend.php

lib/Kolab/CardDAV/LDAPDirectory.php

lib/Kolab/CardDAV/Plugin.php

lib/Kolab/CardDAV/UserAddressBooks.php

lib/Kolab/DAV/Auth/HTTPBasic.php

lib/Kolab/DAV/File.php

lib/Kolab/DAVACL/PrincipalBackend.php

lib/Kolab/Utils/DAVBackend.php

lib/Kolab/Utils/DAVLogger.php

lib/Kolab/Utils/HTTPResponse.php

lib/Kolab/Utils/VObjectUtils.php

public_html/index.php

test/Resource/CalDAV/scheduleprops/1.xml

test/Resource/CardDAV/vcardput/1.vcf

test/Resource/CardDAV/vcardput/10.vcf

test/Resource/CardDAV/vcardput/11.vcf

test/Resource/CardDAV/vcardput/12.vcf

test/Resource/CardDAV/vcardput/13.vcf

test/Resource/CardDAV/vcardput/14.vcf

test/Resource/CardDAV/vcardput/14a.vcf

test/Resource/CardDAV/vcardput/18.vcf

test/Resource/CardDAV/vcardput/2.vcf

test/Resource/CardDAV/vcardput/3.vcf

test/Resource/CardDAV/vcardput/5.vcf

test/Resource/CardDAV/vcardput/6.vcf

test/Resource/CardDAV/vcardput/8.vcf

test/Resource/CardDAV/vcardput/9.vcf

test/runtests.sh

test/scripts/tests/CalDAV/caldavIOP.xml

test/scripts/tests/CalDAV/scheduleprops.xml

test/serverinfo.xml

Merge branch 'dev/sabredav2'
8f79e138a62d
Actions