git.kolab.
ab01422e360f
Actions

Description

Merge branch 'kolab/integration/4.13.0' of https://git.kolab.org/diffusion/KP/kdepim into kolab/integration/4.13.0

Details

Provenance

Christian Mollekopf <chrigi_1@fastmail.fm>	Authored on
mollekopf	Pushed on Jul 20 2015, 9:15 AM

Parents

rKP06435e5a5123: Support multiple incidences with the same uid.
rKPdfb993e1141a: update datetime for conflictresolver directly at start

Branches

Unknown

Tags

Unknown

Build Status

Buildable 1038
Build 1039: Continuous Integration for Software Development Projects

Event Timeline

mollekopf committed rKPab01422e360f: Merge branch 'kolab/integration/4.13.0' of https://git.kolab. (authored by mollekopf).Jul 20 2015, 9:15 AM

Harbormaster completed building B1038: rKPab01422e360f: Merge branch 'kolab/integration/4.13.0' of https://git.kolab..Jul 20 2015, 9:18 AM

Merged Changes

dfb993e1141a update datetime for conflictresolver directly at start
Author
• knauss
Revisions
D38: update datetime for conflictresolver directly at start
Browse Repository
Passed
No Audits
57a93820f262 Expand groups to members when searching for Users.
Author
• knauss
Revisions
D37: Expand groups to members when searching for Users.
Browse Repository
Passed
No Audits
1572d9cde0c8 VacationDialog: Add mailaction
Author
• knauss
Revisions
D36: VacationDialog: Add mailaction
Browse Repository
Passed
No Audits
0d1bff151a2a remove kDebugs
Author
• knauss
Browse Repository
Passed
No Audits
2dbae70c85ab disable vacation script debug
Author
• knauss
Revisions
D34: disable vacation script debug
Browse Repository
Passed
No Audits
38c44420ecf3 Add time support for vacation dialog
Author
• knauss
Revisions
D35: Addtime support for vacation dialog
Browse Repository
Passed
No Audits
aaf3d3ddde89 Allow intervall 0 for vacation resend
Author
• knauss
Revisions
D33: Allow intervall 0 for vacation resend
Browse Repository
Passed
No Audits
f5cf0da9a2b4 some cleanups in sieve Vacation
Author
• knauss
Revisions
D32: some cleanups in sieve Vacation
Browse Repository
Passed
No Audits
1d9d97d7ea1c Use struct to parse/read vacation script.
Author
• knauss
Browse Repository
Passed
No Audits
94cb8575a11c show correct vacation status
Author
• knauss
Revisions
D31: Support KEP:14 in sieveeditor
Browse Repository
Passed
No Audits
30c20931379a parse new vacation script
Author
• knauss
Revisions
D31: Support KEP:14 in sieveeditor
Browse Repository
Passed
No Audits
c0166215bd66 Support KEP:14 in sieveeditor
Author
• knauss
Revisions
D31: Support KEP:14 in sieveeditor
Browse Repository
Passed
No Audits
0f02e2dd0368 expand groups in incidenceeditor for "select attendees..." button
Author
• knauss
Revisions
D29: expand groups in incidenceeditor for "select attendees..." button
Browse Repository
Passed
No Audits

Changes (61)

Path

Size

incidenceeditor-ng/

incidenceattendee.cpp

korganizer/

views/

collectionview/

controller.cpp

libkdepim/

job/

person.h

personsearchjob.cpp

personsearchjob.h

libksieve/

ksieve/

scriptbuilder.h

ksieveui/

CMakeLists.txt

managescriptsjob/

checkkep14supportjob.cpp

generateglobalscriptjob.cpp

generateglobalscriptjob.h

parseuserscriptjob.cpp

parseuserscriptjob.h

tests/

parseuserjobtest.cpp

parseuserjobtest.h

	managescriptsjob/
	vacation/

	checkkep14supportjob.h
	vacationcreatescriptjob.h

scriptsparsing/

xmlprintingscriptbuilder.cpp

xmlprintingscriptbuilder.h

util/

util.cpp

util.h

vacation/

multiimapvacationdialog.cpp

multiimapvacationdialog.h

multiimapvacationmanager.cpp

multiimapvacationmanager.h

tests/

CMakeLists.txt

data

vacation-active-discard.siv

vacation-complex-time.siv

vacation-complex.siv

vacation-deactivate-complex.siv

vacation-deactivate-multiple.siv

vacation-deactivate.siv

vacation-deactive-copy.siv

vacation-deactive-send.siv

vacation-multiple.siv

vacation-notfound.siv

vacation-simple.siv

main.cpp

vacationutilstest.cpp

	tests/

	vacationutilstest.h
	vacationcheckjob.h

vacation.cpp

vacationcheckjob.cpp

vacationcheckjob.h

vacationcreatescriptjob.cpp

vacationcreatescriptjob.h

vacationdialog.cpp

vacationdialog.h

vacationeditwidget.cpp

vacationeditwidget.h

vacationmanager.cpp

vacationmanager.h

vacationpagewidget.cpp

vacationpagewidget.h

vacationscriptextractor.cpp

vacationscriptextractor.h

vacationutils.cpp

vacationutils.h

widgets/

managesievewidget.cpp

parser/

tests/

rKPab01422e360f

View Options

incidenceeditor-ng/incidenceattendee.cpp

View Options

korganizer/views/collectionview/controller.cpp

View Options

libkdepim/job/person.h

View Options

libkdepim/job/personsearchjob.cpp

View Options

libkdepim/job/personsearchjob.h

View Options

libksieve/ksieve/scriptbuilder.h

View Options

libksieve/ksieveui/CMakeLists.txt

View Options

libksieve/ksieveui/managescriptsjob/checkkep14supportjob.cpp

View Options

libksieve/ksieveui/managescriptsjob/checkkep14supportjob.h

View Options

libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.cpp

View Options

libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.h

View Options

libksieve/ksieveui/managescriptsjob/parseuserscriptjob.cpp

View Options

libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h

View Options

libksieve/ksieveui/managescriptsjob/tests/parseuserjobtest.cpp

View Options

libksieve/ksieveui/managescriptsjob/tests/parseuserjobtest.h

View Options

libksieve/ksieveui/scriptsparsing/xmlprintingscriptbuilder.cpp

View Options

libksieve/ksieveui/scriptsparsing/xmlprintingscriptbuilder.h

View Options

libksieve/ksieveui/util/util.cpp

View Options

libksieve/ksieveui/util/util.h

View Options

libksieve/ksieveui/vacation/multiimapvacationdialog.cpp

View Options

libksieve/ksieveui/vacation/multiimapvacationdialog.h

View Options

libksieve/ksieveui/vacation/multiimapvacationmanager.cpp

View Options

libksieve/ksieveui/vacation/multiimapvacationmanager.h

View Options

libksieve/ksieveui/vacation/tests/CMakeLists.txt

View Options

libksieve/ksieveui/vacation/tests/data/vacation-active-discard.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-complex-time.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-complex.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-deactivate-complex.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-deactivate-multiple.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-deactivate.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-deactive-copy.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-deactive-send.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-multiple.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-notfound.siv

View Options

libksieve/ksieveui/vacation/tests/data/vacation-simple.siv

View Options

libksieve/ksieveui/vacation/tests/main.cpp

View Options

libksieve/ksieveui/vacation/tests/vacationutilstest.cpp

View Options

libksieve/ksieveui/vacation/tests/vacationutilstest.h

View Options

libksieve/ksieveui/vacation/vacation.cpp

View Options

libksieve/ksieveui/vacation/vacationcheckjob.cpp

View Options

libksieve/ksieveui/vacation/vacationcheckjob.h

View Options

libksieve/ksieveui/vacation/vacationcreatescriptjob.cpp

View Options

libksieve/ksieveui/vacation/vacationcreatescriptjob.h

View Options

libksieve/ksieveui/vacation/vacationdialog.cpp

View Options

libksieve/ksieveui/vacation/vacationdialog.h

View Options

libksieve/ksieveui/vacation/vacationeditwidget.cpp

View Options

libksieve/ksieveui/vacation/vacationeditwidget.h

View Options

libksieve/ksieveui/vacation/vacationmanager.cpp

View Options

libksieve/ksieveui/vacation/vacationmanager.h

View Options

libksieve/ksieveui/vacation/vacationpagewidget.cpp

View Options

libksieve/ksieveui/vacation/vacationpagewidget.h

View Options

libksieve/ksieveui/vacation/vacationscriptextractor.cpp

View Options

libksieve/ksieveui/vacation/vacationscriptextractor.h

View Options

libksieve/ksieveui/vacation/vacationutils.cpp

View Options

libksieve/ksieveui/vacation/vacationutils.h

View Options

libksieve/ksieveui/widgets/managesievewidget.cpp

View Options

libksieve/ksieveui/widgets/managesievewidget.h

View Options

libksieve/parser/lexer.cpp

View Options

libksieve/parser/parser.cpp

View Options

libksieve/tests/parsertest.cpp

Merge branch 'kolab/integration/4.13.0' of https://git.kolab.ab01422e360fActions

Description

Details

Event Timeline

Merged Changes

Changes (61)

rKPab01422e360f

incidenceeditor-ng/incidenceattendee.cpp

korganizer/views/collectionview/controller.cpp

libkdepim/job/person.h

libkdepim/job/personsearchjob.cpp

libkdepim/job/personsearchjob.h

libksieve/ksieve/scriptbuilder.h

libksieve/ksieveui/CMakeLists.txt

libksieve/ksieveui/managescriptsjob/checkkep14supportjob.cpp

libksieve/ksieveui/managescriptsjob/checkkep14supportjob.h

libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.cpp

libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.h

libksieve/ksieveui/managescriptsjob/parseuserscriptjob.cpp

libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h

libksieve/ksieveui/managescriptsjob/tests/parseuserjobtest.cpp

libksieve/ksieveui/managescriptsjob/tests/parseuserjobtest.h

libksieve/ksieveui/scriptsparsing/xmlprintingscriptbuilder.cpp

libksieve/ksieveui/scriptsparsing/xmlprintingscriptbuilder.h

libksieve/ksieveui/util/util.cpp

libksieve/ksieveui/util/util.h

libksieve/ksieveui/vacation/multiimapvacationdialog.cpp

libksieve/ksieveui/vacation/multiimapvacationdialog.h

libksieve/ksieveui/vacation/multiimapvacationmanager.cpp

libksieve/ksieveui/vacation/multiimapvacationmanager.h

libksieve/ksieveui/vacation/tests/CMakeLists.txt

libksieve/ksieveui/vacation/tests/data/vacation-active-discard.siv

libksieve/ksieveui/vacation/tests/data/vacation-complex-time.siv

libksieve/ksieveui/vacation/tests/data/vacation-complex.siv

libksieve/ksieveui/vacation/tests/data/vacation-deactivate-complex.siv

libksieve/ksieveui/vacation/tests/data/vacation-deactivate-multiple.siv

libksieve/ksieveui/vacation/tests/data/vacation-deactivate.siv

libksieve/ksieveui/vacation/tests/data/vacation-deactive-copy.siv

libksieve/ksieveui/vacation/tests/data/vacation-deactive-send.siv

libksieve/ksieveui/vacation/tests/data/vacation-multiple.siv

libksieve/ksieveui/vacation/tests/data/vacation-notfound.siv

libksieve/ksieveui/vacation/tests/data/vacation-simple.siv

libksieve/ksieveui/vacation/tests/main.cpp

libksieve/ksieveui/vacation/tests/vacationutilstest.cpp

libksieve/ksieveui/vacation/tests/vacationutilstest.h

libksieve/ksieveui/vacation/vacation.cpp

libksieve/ksieveui/vacation/vacationcheckjob.cpp

libksieve/ksieveui/vacation/vacationcheckjob.h

libksieve/ksieveui/vacation/vacationcreatescriptjob.cpp

libksieve/ksieveui/vacation/vacationcreatescriptjob.h

libksieve/ksieveui/vacation/vacationdialog.cpp

libksieve/ksieveui/vacation/vacationdialog.h

libksieve/ksieveui/vacation/vacationeditwidget.cpp

libksieve/ksieveui/vacation/vacationeditwidget.h

libksieve/ksieveui/vacation/vacationmanager.cpp

libksieve/ksieveui/vacation/vacationmanager.h

libksieve/ksieveui/vacation/vacationpagewidget.cpp

libksieve/ksieveui/vacation/vacationpagewidget.h

libksieve/ksieveui/vacation/vacationscriptextractor.cpp

libksieve/ksieveui/vacation/vacationscriptextractor.h

libksieve/ksieveui/vacation/vacationutils.cpp

libksieve/ksieveui/vacation/vacationutils.h

libksieve/ksieveui/widgets/managesievewidget.cpp

libksieve/ksieveui/widgets/managesievewidget.h

libksieve/parser/lexer.cpp

libksieve/parser/parser.cpp

libksieve/tests/parsertest.cpp

Merge branch 'kolab/integration/4.13.0' of https://git.kolab.
ab01422e360f
Actions