1. 04 Apr, 2020 1 commit
  2. 29 Feb, 2020 1 commit
  3. 09 Feb, 2020 1 commit
  4. 08 Feb, 2020 1 commit
  5. 24 Jan, 2020 1 commit
  6. 07 Nov, 2019 1 commit
  7. 11 Oct, 2019 1 commit
    • Volker Krause's avatar
      Unbreak Qt 5.11 build · 9629a5ef
      Volker Krause authored
      qGetPtrHelper/Q_DECLARE_PRIVATE only works with std::unique_ptr starting
      with Qt 5.12 unfortunately, so use a QScopedPointer instead here.
      9629a5ef
  8. 21 Sep, 2019 1 commit
  9. 22 Jun, 2018 1 commit
  10. 20 Apr, 2018 2 commits
  11. 15 Sep, 2017 1 commit
  12. 10 Jan, 2017 1 commit
  13. 04 Jan, 2017 1 commit
  14. 28 Dec, 2016 5 commits
  15. 18 Jun, 2015 2 commits
    • Grégory Oestreicher's avatar
      Add simple conflict handling · 5f47e30a
      Grégory Oestreicher authored
      The conflict dialog will only be shown for local update / remote update
      conflicts. For cases where one side deleted the item while it was updated
      on the other, the deleting side loses the conflict automatically to prevent
      data loss.
      
      Conflicts:
      	resources/dav/common/davitemdeletejob.cpp
      	resources/dav/common/davitemdeletejob.h
      	resources/dav/common/davitemfetchjob.cpp
      	resources/dav/common/davitemmodifyjob.cpp
      	resources/dav/common/davitemmodifyjob.h
      	resources/dav/common/davjobbase.cpp
      	resources/dav/common/davjobbase.h
      	resources/dav/resource/davgroupwareresource.cpp
      	resources/dav/resource/davgroupwareresource.h
      5f47e30a
    • Grégory Oestreicher's avatar
      Add simple conflict handling · b24565e1
      Grégory Oestreicher authored
      The conflict dialog will only be shown for local update / remote update
      conflicts. For cases where one side deleted the item while it was updated
      on the other, the deleting side loses the conflict automatically to prevent
      data loss.
      
      BUG: 335090
      BUG: 338570
      FIXED-IN: 4.14.10
      b24565e1
  16. 14 Dec, 2014 2 commits
  17. 31 Aug, 2014 1 commit
    • Grégory Oestreicher's avatar
      Don't unnecessarily go offline · 8b3dc67d
      Grégory Oestreicher authored
      Check if the error returned by the jobs while creating,
      modifying or deleting items are transient or final
      and act accordingly.
      
      CCBUG: 335090
      CCBUG: 335833
      8b3dc67d