4.13.0
b05559f48077
Actions

Description

Merge branch 'dev/itiphandling' into kolab/integration/4.13.0

fixes most cases of invitation handling via mail (especially

exception handling)

added tests for these cases
activate akonadi/calendartests

Details

Provenance

• knauss	Authored on
• knauss	Pushed on Jun 12 2015, 6:16 PM
• knauss	Pushed on Jun 12 2015, 6:08 PM

Parents

rKPL104a21d465e7: show status of exception
rKPLc8db75c175d1: Update createjob result immediately and not after sending the mail.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 757
Build 758: Continuous Integration for Software Development Projects

Event Timeline

• knauss committed rKPLb05559f48077: Merge branch 'dev/itiphandling' into kolab/integration/4.13.0 (authored by • knauss).Jun 12 2015, 6:05 PM

Harbormaster completed building B757: rKPLb05559f48077: Merge branch 'dev/itiphandling' into kolab/integration/4.13.0.Jun 12 2015, 6:21 PM

• knauss mentioned this in D21: show status of exception.Jun 12 2015, 6:28 PM

• knauss mentioned this in D20: fix acceptReply.

• knauss mentioned this in D19: fix acceptCancel.

• knauss mentioned this in D18: fix acceptRequest.

• knauss mentioned this in D17: Fix issue if updating exception via modifyIncidence.

• knauss mentioned this in D14: Add tests for iTip handling with event is calendars already..Jun 12 2015, 6:33 PM

Merged Changes

104a21d465e7 show status of exception
Author
• knauss
Browse Repository
Passed
No Audits
f3c746805d58 fix acceptReply
Author
• knauss
Browse Repository
Passed
No Audits
69f6d3b811ce fix acceptCancel
Author
• knauss
Browse Repository
Passed
No Audits
ea9fd5647487 fix acceptRequest
Author
• knauss
Browse Repository
Passed
No Audits
ac8ea607e7ea Fix issue if updating exception via modifyIncidence
Author
• knauss
Browse Repository
Passed
No Audits
d009106d036d Add tests for iTip handling with event is calendars already.
Author
• knauss
Browse Repository
Passed
No Audits
85214d58debc Search for existing incidences also by instanceIdentifier
Author
• knauss
Browse Repository
Passed
No Audits
362256bd6b9e Do not increment revision, if only a schedulingid is added
Author
• knauss
Browse Repository
Passed
No Audits
71b9133f3f1f Do not trigger dirty fields with no changes
Author
• knauss
Browse Repository
Passed
No Audits
4cdb6564f92d Add tests for iTip handling with event is calendars already.
Author
• knauss
Browse Repository
Passed
No Audits
1072e206b464 test if exeception is part of the calendar and not the main event.
Author
• knauss
Browse Repository
Passed
No Audits

Changes (21)

Path

Size

akonadi/

calendar/

tests/

itip_data/

expected_data/

cancel1

	cancel2
	cancel1

	replyexception
	cancel1

	replymain
	cancel1

invited_us_daily_cancel_recid01

	invited_us_daily_recid01
	invited_us_daily_cancel_recid01

invited_us_daily_reply

invited_us_daily_reply_recid01

kcalcore/

kcalutils/

incidenceformatter.cpp

rKPLb05559f48077

View Options

akonadi/calendar/CMakeLists.txt

View Options

akonadi/calendar/calendarbase.cpp

View Options

akonadi/calendar/incidencechanger.cpp

View Options

akonadi/calendar/scheduler_p.cpp

View Options

akonadi/calendar/scheduler_p.h

View Options

akonadi/calendar/tests/CMakeLists.txt

View Options

akonadi/calendar/tests/calendarbasetest.cpp

View Options

akonadi/calendar/tests/calendarbasetest.h

View Options

akonadi/calendar/tests/itip_data/expected_data/cancel1

View Options

akonadi/calendar/tests/itip_data/expected_data/cancel2

View Options

akonadi/calendar/tests/itip_data/expected_data/replyexception

View Options

akonadi/calendar/tests/itip_data/expected_data/replymain

View Options

akonadi/calendar/tests/itip_data/invited_us_daily_cancel_recid01

View Options

akonadi/calendar/tests/itip_data/invited_us_daily_recid01

View Options

akonadi/calendar/tests/itip_data/invited_us_daily_reply

View Options

akonadi/calendar/tests/itip_data/invited_us_daily_reply_recid01

View Options

akonadi/calendar/tests/itiphandlertest.cpp

View Options

akonadi/calendar/tests/itiphandlertest.h

View Options

kcalcore/incidence.cpp

View Options

kcalcore/incidencebase.cpp

View Options

kcalutils/incidenceformatter.cpp

Merge branch 'dev/itiphandling' into kolab/integration/4.13.0b05559f48077Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rKPLb05559f48077

akonadi/calendar/CMakeLists.txt

akonadi/calendar/calendarbase.cpp

akonadi/calendar/incidencechanger.cpp

akonadi/calendar/scheduler_p.cpp

akonadi/calendar/scheduler_p.h

akonadi/calendar/tests/CMakeLists.txt

akonadi/calendar/tests/calendarbasetest.cpp

akonadi/calendar/tests/calendarbasetest.h

akonadi/calendar/tests/itip_data/expected_data/cancel1

akonadi/calendar/tests/itip_data/expected_data/cancel2

akonadi/calendar/tests/itip_data/expected_data/replyexception

akonadi/calendar/tests/itip_data/expected_data/replymain

akonadi/calendar/tests/itip_data/invited_us_daily_cancel_recid01

akonadi/calendar/tests/itip_data/invited_us_daily_recid01

akonadi/calendar/tests/itip_data/invited_us_daily_reply

akonadi/calendar/tests/itip_data/invited_us_daily_reply_recid01

akonadi/calendar/tests/itiphandlertest.cpp

akonadi/calendar/tests/itiphandlertest.h

kcalcore/incidence.cpp

kcalcore/incidencebase.cpp

kcalutils/incidenceformatter.cpp

Merge branch 'dev/itiphandling' into kolab/integration/4.13.0
b05559f48077
Actions