Diffusion syncroton 847056c84bdb

Merge branch 'master' into feature/meeting-request
847056c84bdb
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' into feature/meeting-request

Conflicts:
lib/kolab_sync_data.php
lib/kolab_sync_data_calendar.php

Details

Provenance

machniak	Authored on Aug 21 2017, 2:22 PM
machniak	Pushed on Aug 21 2017, 6:43 PM

Parents

rSc8ce13669ab8: Fix setting attendee status when syncing event from a device to the server…
rS409371a7cf4f: T2483: First take on MeetingResponse support

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rS847056c84bdb: Merge branch 'master' into feature/meeting-request (authored by machniak).Aug 21 2017, 2:22 PM

Merged Changes

c8ce13669ab8 Fix setting attendee status when syncing event from a device to the server…
Author
machniak
Browse Repository
Building
No Audits
d32b2289c65d Return "Invalid item" (6) status on SMS entries instead of "Server error" (5)
Author
machniak
Browse Repository
Building
No Audits
a68e0428fdb0 Bump SEQUENCE number on update (Outlook only).
Author
machniak
Browse Repository
Building
No Audits
ca089e32a5de Fix LDAP connection errors in Ping when using activesync_gal_sync
Author
machniak
Browse Repository
Building
No Audits
945eeaf741bd Add 'ready' hook for Kolab plugins (Bifrost#T36327)
Author
machniak
Browse Repository
Building
No Audits
17d529a62739 Bump version to 2.3.6
Author
vanmeeuwen
Browse Repository
Building
No Audits
0a1b6c8987fe Bifrost#T36198: Create non-conflicting ServerId for objects with non-unique or…
Author
machniak
Revisions
D473: Bifrost#T36198: Create non-conflicting ServerId for objects with non-unique or long UID
Browse Repository
Building
No Audits
b861a4b2a34a T2567: Better plain/text message bodies synchronization for devices with no…
Author
machniak
Browse Repository
Building
No Audits
57a999faa8db T2555: Fix invalid ExceptionStartTime value
Author
machniak
Browse Repository
Building
No Audits
cad59ed0afa4 Ignore recurrence for events with no RRULE
Author
machniak
Browse Repository
Building
No Audits
0e76cc48e4cb Use Roundcube's per_user_logging instead of activesync_user_debug
Author
machniak
Browse Repository
Building
No Audits
5e8d37912f3c CS fixes, small code improvements, more timezone converter tests
Author
machniak
Browse Repository
Building
No Audits
bd97cab43bff Remove old commented code
Author
machniak
Browse Repository
Building
No Audits
e21c6d07fca6 Fix bug where timezone transitions could be wrong for some zones e.g.
Author
machniak
Browse Repository
Building
No Audits

Changes (7)

Path

Size

lib/

kolab_sync_data.php

kolab_sync_data_calendar.php

kolab_sync_data_email.php

kolab_sync_data_gal.php

kolab_sync_timezone_converter.php

tests/

timezone_converter.php

rS847056c84bdb

lib/kolab_sync.php

Loading...

lib/kolab_sync_data.php

Loading...

lib/kolab_sync_data_calendar.php

Loading...

lib/kolab_sync_data_email.php

Loading...

lib/kolab_sync_data_gal.php

Loading...

lib/kolab_sync_timezone_converter.php

Loading...

tests/timezone_converter.php

Loading...