1. 20 Apr, 2015 3 commits
  2. 17 Apr, 2015 1 commit
    • Christian Mollekopf's avatar
      Merge branch 'kolab/integration/4.13.0' into mergeKolabIntegration · 851effe2
      Christian Mollekopf authored
      Conflicts:
      	CMakeLists.txt
      	accountwizard/wizards/tine20/Messages.sh
      	kcm/configmodule.cpp
      	plugins/akonadi_serializer_kcalcore.cpp
      	plugins/akonadi_serializer_kcalcore.h
      	plugins/akonadi_serializer_mail.cpp
      	resources/CMakeLists.txt
      	resources/google/contacts/contactsresource.cpp
      	resources/imap/CMakeLists.txt
      	resources/imap/addcollectiontask.cpp
      	resources/imap/additemtask.cpp
      	resources/imap/autotests/dummyresourcestate.cpp
      	resources/imap/autotests/dummyresourcestate.h
      	resources/imap/autotests/testmoveitemstask.cpp
      	resources/imap/autotests/testretrievecollectionmetadatatask.cpp
      	resources/imap/batchfetcher.cpp
      	resources/imap/batchfetcher.h
      	resources/imap/changecollectiontask.cpp
      	resources/imap/changecollectiontask.h
      	resources/imap/changeitemsflagstask.cpp
      	resources/imap/changeitemsflagstask.h
      	resources/imap/changeitemtask.cpp
      	resources/imap/collectionmetadatahelper.cpp
      	resources/imap/imapidlemanager.cpp
      	resources/imap/imapidlemanager.h
      	resources/imap/imapresource.cpp
      	resources/imap/imapresource.h
      	resources/imap/imapresourcebase.h
      	resources/imap/messagehelper.cpp
      	resources/imap/messagehelper.h
      	resources/imap/moveitemstask.cpp
      	resources/imap/replacemessagejob.cpp
      	resources/imap/replacemessagejob.h
      	resources/imap/resourcestate.cpp
      	resources/imap/resourcestate.h
      	resources/imap/resourcestateinterface.h
      	resources/imap/resourcetask.cpp
      	resources/imap/resourcetask.h
      	resources/imap/retrievecollectionmetadatatask.cpp
      	resources/imap/retrievecollectionmetadatatask.h
      	resources/imap/retrievecollectionstask.h
      	resources/imap/retrieveitemstask.cpp
      	resources/imap/retrieveitemstask.h
      	resources/imap/retrieveitemtask.cpp
      	resources/imap/retrieveitemtask.h
      	resources/imap/serverinfodialog.cpp
      	resources/imap/serverinfodialog.h
      	resources/imap/sessionpool.cpp
      	resources/imap/sessionpool.h
      	resources/imap/settings.cpp
      	resources/imap/settings.h
      	resources/imap/settingspasswordrequester.cpp
      	resources/imap/settingspasswordrequester.h
      	resources/imap/setupserver.cpp
      	resources/imap/setupserver.h
      	resources/imap/tests/testretrieveitemstask.cpp
      	resources/imap/tests/testsessionpool.cpp
      	resources/kolab/kolabaddtagtask.cpp
      	resources/kolab/kolabaddtagtask.h
      	resources/kolab/kolabchangeitemsrelationstask.cpp
      	resources/kolab/kolabchangeitemstagstask.cpp
      	resources/kolab/kolabchangeitemstagstask.h
      	resources/kolab/kolabchangetagtask.cpp
      	resources/kolab/kolabchangetagtask.h
      	resources/kolab/kolabhelpers.cpp
      	resources/kolab/kolabmessagehelper.cpp
      	resources/kolab/kolabmessagehelper.h
      	resources/kolab/kolabrelationresourcetask.h
      	resources/kolab/kolabremovetagtask.h
      	resources/kolab/kolabresource.cpp
      	resources/kolab/kolabresource.desktop
      	resources/kolab/kolabresource.h
      	resources/kolab/kolabresourcestate.cpp
      	resources/kolab/kolabresourcestate.h
      	resources/kolab/kolabretrievecollectionstask.h
      	resources/kolab/kolabretrievetagstask.h
      	resources/kolab/kolabsettings.cpp
      	resources/kolab/kolabsettings.h
      	resources/kolab/setupserverview_desktop.ui
      	resources/kolab/setupserverview_mobile.ui
      	resources/kolab/tagchangehelper.cpp
      	resources/kolab/tagchangehelper.h
      	resources/kolab/updatemessagejob.h
      	resources/kolab/wizard/Messages.sh
      	resources/kolab/wizard/kolabwizard.es
      	resources/kolab/wizard/kolabwizard.ui
      	resources/kolab/wizard/kolabwizard2.ui
      	resources/kolabproxy/collectiontreebuilder.cpp
      	resources/kolabproxy/kolabproxyresource.cpp
      	resources/kolabproxy/kolabproxyresource.desktop
      	resources/kolabproxy/wizard/CMakeLists.txt
      	resources/maildir/libmaildir/autotests/testmaildir.cpp
      	resources/maildir/libmaildir/keycache.cpp
      	resources/maildir/libmaildir/maildir.cpp
      	resources/mbox/mboxresource.cpp
      	resources/mixedmaildir/autotests/itemfetchtest.cpp
      	resources/mixedmaildir/kmindexreader/kmindexreader.cpp
      	resources/shared/singlefileresource/autotests/imapaclattributetest.cpp
      	resources/shared/singlefileresource/imapaclattribute.cpp
      	resources/shared/singlefileresource/imapaclattribute.h
      	resources/vcard/wizard/vcardwizard.ui
      	resources/vcarddir/wizard/Messages.sh
      851effe2
  3. 15 Apr, 2015 1 commit
    • Laurent Montel's avatar
      Update patch. Now we can compile. · 98c09387
      Laurent Montel authored
      It was necessary to port KABC to KContact and remove PimUtils.
      
      I wanted to update source code to master but it doesn't work.
      I don't know why I can't update source code yet
      98c09387
  4. 14 Apr, 2015 5 commits
  5. 13 Apr, 2015 2 commits
  6. 12 Apr, 2015 7 commits
  7. 07 Apr, 2015 4 commits
  8. 24 Mar, 2015 3 commits
  9. 21 Mar, 2015 1 commit
  10. 15 Mar, 2015 1 commit
  11. 13 Mar, 2015 2 commits
  12. 12 Mar, 2015 3 commits
  13. 11 Mar, 2015 2 commits
  14. 09 Mar, 2015 2 commits
  15. 08 Mar, 2015 1 commit
  16. 07 Mar, 2015 1 commit
  17. 06 Mar, 2015 1 commit