Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

One or more items in the folder you synchronized do not match. To resolve the conflicts, open the items, and then try this operation again. #1369

Closed
sunnykaul5 opened this issue Jan 9, 2022 · 12 comments
Closed

One or more items in the folder you synchronized do not match. To resolve the conflicts, open the items, and then try this operation again. #1369

sunnykaul5 opened this issue Jan 9, 2022 · 12 comments
Assignees
@phw198
Labels
enhancement New feature
Milestone
v2.9.4

Comments

@sunnykaul5
Copy link

sunnykaul5 commented Jan 9, 2022 •
edited by phw198
Loading

📝 Use the below template to report your issue.
💡 Upgrade to the latest alpha release to check if the problem is already fixed.
📎 To aid investigation, provide your OGcalsync.log file (see instructions).

OGCS Version: v1.2.3.4
Installed or Portable: Installed

Problem Description
2022-01-09 16:39:40,312 ERROR 21 OutlookGoogleCalendarSync.Console [278] - One or more items in the folder you synchronized do not match. To resolve the conflicts, open the items, and then try this operation again.

Steps to Reproduce the Issue

  1. <Update>

Any other information
<Update here>
@sunnykaul5
Copy link
Author

OGcalsync.log file attached
OGcalsync.log

@sunnykaul5
Copy link
Author

I'm unable to see Gmail entries on my outlook. The vice-versa is not true.

@sunnykaul5
Copy link
Author

I think it is something to do with the outlook default calendar not being recognized anymore. No outlook settings were changed. However, I did update to the latest version of OGCS and this issue started to surface.

@BetonFPS
Copy link

BetonFPS commented Jan 14, 2022 •
edited by phw198
Loading

Hi,
I have the same issues since a couple days.
The Log states:

22-01-14 07:36:40,301 ERROR  6 OutlookGoogleCalendarSync.OGCSexception [28] -  System.Runtime.InteropServices.COMException: In dem Ordner, den Sie synchronisiert haben, stimmt mindestens ein Element nicht mit einem anderen überein. Um den Konflikt zu lösen, öffnen Sie bitte die Elemente und führen Sie diesen Vorgang erneut aus.
2022-01-14 07:36:40,311 ERROR  6 OutlookGoogleCalendarSync.OGCSexception [21] -  Code: 0xCC520009,-867041271; Location: get_Categories() in <Unknown File>
2022-01-14 07:36:40,312 ERROR  6 OutlookGoogleCalendarSync.OGCSexception [65] -     bei Microsoft.Office.Interop.Outlook._AppointmentItem.get_Categories()
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.FilterCalendarEntries(Items OutlookItems, Boolean filterBySettings, Boolean noDateFilter, String extraFilter, Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 208.
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.GetCalendarEntriesInRange(Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 121.
   bei OutlookGoogleCalendarSync.Sync.Engine.synchronize() in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\Sync\Engine.cs:Zeile 370.

What is really weird is:
C:\Users\Paul\Git\
That is not my username.

@BetonFPS
Copy link

BetonFPS commented Jan 14, 2022 •
edited by phw198
Loading

Another Log Entry:

2022-01-14 08:06:39,755 ERROR  10 OutlookGoogleCalendarSync.OGCSexception [28] -  System.Runtime.InteropServices.COMException: In dem Ordner, den Sie synchronisiert haben, stimmt mindestens ein Element nicht mit einem anderen überein. Um den Konflikt zu lösen, öffnen Sie bitte die Elemente und führen Sie diesen Vorgang erneut aus.
2022-01-14 08:06:39,755 ERROR  10 OutlookGoogleCalendarSync.OGCSexception [21] -  Code: 0x92820009,-1836974071; Location: get_Categories() in <Unknown File>
2022-01-14 08:06:39,755 ERROR  10 OutlookGoogleCalendarSync.OGCSexception [65] -     bei Microsoft.Office.Interop.Outlook._AppointmentItem.get_Categories()
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.FilterCalendarEntries(Items OutlookItems, Boolean filterBySettings, Boolean noDateFilter, String extraFilter, Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 208.
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.GetCalendarEntriesInRange(Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 121.
   bei OutlookGoogleCalendarSync.Sync.Engine.synchronize() in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\Sync\Engine.cs:Zeile 371.
   bei OutlookGoogleCalendarSync.Sync.Engine.<>c__DisplayClass24_0.<Start>b__0(Object o, DoWorkEventArgs args) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\Sync\Engine.cs:Zeile 217.
2022-01-14 08:06:39,758 ERROR  10 OutlookGoogleCalendarSync.Console [278] -  In dem Ordner, den Sie synchronisiert haben, stimmt mindestens ein Element nicht mit einem anderen überein. Um den Konflikt zu lösen, öffnen Sie bitte die Elemente und führen Sie diesen Vorgang erneut aus.
2022-01-14 08:06:53,660 INFO  1 OutlookGoogleCalendarSync.Sync.Engine [200] -  User opted to abandon further syncs.

@sunnykaul5
Copy link
Author

sunnykaul5 commented Jan 14, 2022 via email

@phw198
Copy link
Owner

phw198 commented Jan 23, 2022

@BetonFPS The logging of C:\Users\Paul\Git\ is a feature of log4net - it captures the development build machine's path, not the users.

This error is not one produced by OGCS, but Outlook itself. Issue #1338 also reported this and their solution was to recreate the Outlook profile. See my comment at the end to see if that helps before trying that though.

@phw198 phw198 added the duplicate Already covered by another issue label Jan 23, 2022
@phw198 phw198 changed the title 2022-01-09 16:39:40,312 ERROR 21 OutlookGoogleCalendarSync.Console [278] - One or more items in the folder you synchronized do not match. To resolve the conflicts, open the items, and then try this operation again. One or more items in the folder you synchronized do not match. To resolve the conflicts, open the items, and then try this operation again. Jan 23, 2022
@BetonFPS
Copy link

BetonFPS commented Jan 24, 2022 •
edited by phw198
Loading

Hi Paul,
thanks for the answers. Unfortunately your tips:
an Office repair
a repair of the OST/PST file
didn't help.
The solution in the other thread (removing the profiles) is not an option for me.
It still says:

2022-01-24 07:55:15,433 INFO  20 OutlookGoogleCalendarSync.Console [282] -  Scanning Outlook calendar...
2022-01-24 07:55:16,630 ERROR  20 OutlookGoogleCalendarSync.OGCSexception [28] -  System.Runtime.InteropServices.COMException: In dem Ordner, den Sie synchronisiert haben, stimmt mindestens ein Element nicht mit einem anderen überein. Um den Konflikt zu lösen, öffnen Sie bitte die Elemente und führen Sie diesen Vorgang erneut aus.
2022-01-24 07:55:16,630 ERROR  20 OutlookGoogleCalendarSync.OGCSexception [21] -  Code: 0xB5920009,-1248722935; Location: get_Categories() in <Unknown File>
2022-01-24 07:55:16,631 ERROR  20 OutlookGoogleCalendarSync.OGCSexception [65] -     bei Microsoft.Office.Interop.Outlook._AppointmentItem.get_Categories()
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.FilterCalendarEntries(Items OutlookItems, Boolean filterBySettings, Boolean noDateFilter, String extraFilter, Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 208.
   bei OutlookGoogleCalendarSync.OutlookOgcs.Calendar.GetCalendarEntriesInRange(Boolean suppressAdvisories) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\OutlookOgcs\OutlookCalendar.cs:Zeile 121.
   bei OutlookGoogleCalendarSync.Sync.Engine.synchronize() in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\Sync\Engine.cs:Zeile 371.
   bei OutlookGoogleCalendarSync.Sync.Engine.<>c__DisplayClass24_0.<Start>b__0(Object o, DoWorkEventArgs args) in C:\Users\Paul\Git\OutlookGoogleCalendarSync\src\OutlookGoogleCalendarSync\Sync\Engine.cs:Zeile 217.
2022-01-24 07:55:16,631 ERROR  20 OutlookGoogleCalendarSync.Console [278] -  In dem Ordner, den Sie synchronisiert haben, stimmt mindestens ein Element nicht mit einem anderen überein. Um den Konflikt zu lösen, öffnen Sie bitte die Elemente und führen Sie diesen Vorgang erneut aus.

@phw198
Copy link
Owner

phw198 commented Jan 29, 2022

@BetonFPS Try going through the instructions here to look for conflicts in the calendar folder you are syncing with OGCS. Let me know if you can see any items with the "cross swords" to denote a conflict.

@BetonFPS
Copy link

Hi @phw198 ! Thanks for you reply!
I actually found an even easier fix for this.
If you right click on the calendar you can just "Clear offline items" and then resynch the calendar via the pane option "Send / Receive"! It works now.
@sunnykaul5 : That should work for you as well!

@sunnykaul5
Copy link
Author

sunnykaul5 commented Jan 31, 2022 via email

@phw198
Copy link
Owner

phw198 commented Feb 1, 2022

Thanks @BetonFPS for providing your solution - certainly seems the most the straight forward!

I've now worked up a wiki entry for this, and will get OGCS to link to it.

@phw198 phw198 added enhancement New feature and removed duplicate Already covered by another issue labels Feb 1, 2022
@phw198 phw198 self-assigned this Feb 1, 2022
@phw198 phw198 added this to the v2.9.4 milestone Feb 20, 2022
@phw198 phw198 closed this as completed in 32d7a86 Apr 12, 2022
phw198 added a commit that referenced this issue Apr 18, 2022
@phw198
Squashed commit of v2.9.4 to update #1402:
67207ed 
commit 860952d
Author: Paul Woolcock <[email protected]>
Date:   Mon Apr 18 11:10:01 2022 +0100

    OGCS_Setup.exe rename

commit c3922fc
Author: Paul Woolcock <[email protected]>
Date:   Wed Apr 13 00:23:25 2022 +0100

    v2.9.4

commit a799f5f
Merge: 6c812c0 7598760
Author: Paul Woolcock <[email protected]>
Date:   Tue Apr 12 22:57:26 2022 +0100

    Merge branch 'development' of https://github.com/phw198/OutlookGoogleCalendarSync into release

commit 6c812c0
Merge: 2fb6537 8517459
Author: Paul Woolcock <[email protected]>
Date:   Sun Apr 10 21:40:17 2022 +0100

    Merge branch 'issue-1396' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Closes #1396

commit 2fb6537
Merge: 06d4798 e44ba86
Author: Paul Woolcock <[email protected]>
Date:   Sun Apr 10 21:37:24 2022 +0100

    Merge branch 'issue-1385' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Closes #1385

commit 06d4798
Merge: d46787a f488eeb
Author: Paul Woolcock <[email protected]>
Date:   Tue Apr 5 00:12:46 2022 +0100

    Merge branch 'issue-1402' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Fixes #1402

commit 7598760
Merge: 08936ac d75e394
Author: Paul Woolcock <[email protected]>
Date:   Sun Apr 3 20:56:40 2022 +0100

    Merge branch 'development' of https://github.com/phw198/OutlookGoogleCalendarSync into development

commit 08936ac
Author: Paul Woolcock <[email protected]>
Date:   Sun Mar 13 23:32:21 2022 +0000

    Log as FAIL when can't find item to post-process after copy and paste.
    Minor tweaks when upgrading.

commit d46787a
Merge: 1d9defb 443e5d9
Author: Paul Woolcock <[email protected]>
Date:   Sun Apr 3 20:17:17 2022 +0100

    Merge branch 'issue-1389' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Resolves #1389

commit 1d9defb
Author: Paul Woolcock <[email protected]>
Date:   Sun Apr 3 16:26:13 2022 +0100

    Squashed commit of the following resolves #1396:

    commit 8517459
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Apr 2 18:41:28 2022 +0100

        Compare on Sync.Direction.Id attribute.
        #1396

    commit 6132fa6
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Apr 2 11:02:55 2022 +0100

        Compare on SyncDirection Id attribute.
        #1396

commit 8517459
Author: Paul Woolcock <[email protected]>
Date:   Sat Apr 2 18:41:28 2022 +0100

    Compare on Sync.Direction.Id attribute.
    #1396

commit 332fe2b
Merge: b47453d df01a07
Author: Paul Woolcock <[email protected]>
Date:   Sat Apr 2 11:45:13 2022 +0100

    Merge branch 'issue-1285' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Closes #1285

commit b47453d
Merge: 86f43d6 8b45d9a
Author: Paul Woolcock <[email protected]>
Date:   Sat Apr 2 11:15:24 2022 +0100

    Merge branch 'issue-1399' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Resolves #1399

commit 6132fa6
Author: Paul Woolcock <[email protected]>
Date:   Sat Apr 2 11:02:55 2022 +0100

    Compare on SyncDirection Id attribute.
    #1396

commit 86f43d6
Merge: 39deab5 01cb854
Author: Paul Woolcock <[email protected]>
Date:   Sun Mar 27 20:35:47 2022 +0100

    Merge branch 'issue-1394' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Fixes #1394

commit 8b45d9a
Author: Paul Woolcock <[email protected]>
Date:   Mon Mar 14 01:27:22 2022 +0000

    If obfuscation in other direction, return unaltered target string.
    #1399

commit df01a07
Author: Paul Woolcock <[email protected]>
Date:   Sun Mar 13 17:50:57 2022 +0000

    Minor logging change.
    #1285

commit 98b4a6a
Author: Paul Woolcock <[email protected]>
Date:   Sun Mar 13 13:21:36 2022 +0000

    New enumeration instead of Boolean for isDeleted state.
    #1285

commit 443e5d9
Author: Paul Woolcock <[email protected]>
Date:   Sun Mar 6 13:51:24 2022 +0000

    Ensure the cached categories are valid.
    #1389

commit dc7135d
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 27 19:37:33 2022 +0000

    Bugfix: Stop update check if latest version has been skipped.

commit 01cb854
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 27 18:18:54 2022 +0000

    Ensure correct Outlook calendar is being used.
    #1394

commit 7d39569
Merge: 5cb9bde 70f8acf
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 27 18:16:40 2022 +0000

    Merge branch 'master' of https://github.com/phw198/OutlookGoogleCalendarSync into development

commit 5cb9bde
Merge: e4e0a65 28eb4c9
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 27 14:18:18 2022 +0000

    Cherry picked logging changes from
    28eb4c9

commit d75e394
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 27 13:59:43 2022 +0000

    Direct users to GitHub issue for 412 errors.
    #528

commit 28eb4c9
Author: Paul Woolcock <[email protected]>
Date:   Sat Jun 23 11:35:24 2018 +0100

    Remove cached instances of event; re-retrieve all recurring instances; force a save.
    Reported not to be successful.
    Issue #528

commit 39deab5
Merge: 8513447 d540b98
Author: Paul Woolcock <[email protected]>
Date:   Sat Feb 26 20:00:16 2022 +0000

    Merge branch 'issue-1379' of https://github.com/phw198/OutlookGoogleCalendarSync into release
    Closes #1379

commit cadc370
Author: Paul Woolcock <[email protected]>
Date:   Sat Feb 26 19:31:47 2022 +0000

    Do not delete inaccessible occurrences of an Outlook series.
    Closes #1285

commit e4e0a65
Author: Paul Woolcock <[email protected]>
Date:   Mon Feb 21 00:14:17 2022 +0000

    Quietly continue without masking path if environment variables not available.
    Closes #1282

commit 3bd99c1
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 20 18:47:58 2022 +0000

    Avoid loss of Google description when none exists in Outlook.
    Resolves #1368

commit 32d7a86
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 20 14:23:32 2022 +0000

    Direct Outlook conflict errors to the wiki for resolution.
    Closes #1369 #1338

commit 63f8978
Author: Paul Woolcock <[email protected]>
Date:   Sat Feb 19 14:57:08 2022 +0000

    Rename Setup.exe file.
    Resolves #1346

commit f5e320e
Author: Paul Woolcock <[email protected]>
Date:   Fri Feb 18 00:28:13 2022 +0000

    Donation telemetry on OGCS button and version.

commit 70f8acf
Author: Paul Woolcock <[email protected]>
Date:   Fri Feb 18 00:04:38 2022 +0000

    v2.9.3

commit e44ba86
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 13 21:38:31 2022 +0000

    Ensure push sync engine has active profile.

commit ac21b96
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 13 21:38:31 2022 +0000

    Ensure push sync engine has active profile.

commit 6551fa5
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 13 18:55:39 2022 +0000

    Quietly log failure to get CurrentUser if GAL blocked.
    Handle nulls in colour map.
    Attempt saving again if settings.xml file locked when upgrading config.

commit e0b66b4
Author: Paul Woolcock <[email protected]>
Date:   Sun Feb 13 18:50:59 2022 +0000

    Pulling master branch in. Squashed commit of the following:

    commit 9aecda4
    Author: Paul Woolcock <[email protected]>
    Date:   Wed Feb 9 01:03:16 2022 +0000

        Ensure settings are upgraded for v2.9.3

    commit 8513447
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Feb 6 19:17:00 2022 +0000

        v2.9.3

    commit 62a780a
    Merge: 952c329 25defe6
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Feb 6 18:21:35 2022 +0000

        Merge branch 'dog-food' of https://github.com/phw198/OutlookGoogleCalendarSync into release
        Closes #1307

    commit 25defe6
    Merge: 0374a48 c4d0f08
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Feb 6 17:56:02 2022 +0000

        Merge branch 'issue-1337' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 0374a48
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Feb 5 17:01:57 2022 +0000

        Correctly set minimum size of main form.
        Obscure settings tabs when profile loading instead of disabling tab and child controls.
        #1307

    commit 952c329
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 28 15:18:23 2021 +0000

        Squashed commit of the following:

        commit c4d0f08
        Author: Paul Woolcock <[email protected]>
        Date:   Sun Nov 28 15:15:47 2021 +0000

            Surface ApplicationException message in the console.
            #1337

        commit 76baa33
        Author: Paul Woolcock <[email protected]>
        Date:   Sat Nov 20 14:12:24 2021 +0000

            Extra logging.
            #1337

        Closes #1337

    commit c4d0f08
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 28 15:15:47 2021 +0000

        Surface ApplicationException message in the console.
        #1337

    commit dcb886a
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 21 17:07:56 2021 +0000

        Reconnect on failure of GetFolderFromID().
        Use new Settings.AreApplied and Forms.Main.LoadingProfileConfig property instead of form visiblity.
        #1307

    commit 378b287
    Merge: ededcf6 673a6a7
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 20 22:04:02 2021 +0000

        Merge branch 'issue-1343' of https://github.com/phw198/OutlookGoogleCalendarSync into release
        Resolves #1343

    commit 673a6a7
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 20 15:43:54 2021 +0000

        Remove alt-tab entry when minimised to system tray.
        Reverting some of #1321 3d4ba6d
        #1343

    commit 76baa33
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 20 14:12:24 2021 +0000

        Extra logging.
        #1337

    commit ededcf6
    Author: Paul Woolcock <[email protected]>
    Date:   Wed Nov 17 22:47:41 2021 +0000

        Handle Google calendars that have no default "popup" notification.
        Fixes #1344

    commit 9e1599b
    Author: Paul Woolcock <[email protected]>
    Date:   Wed Nov 17 00:38:32 2021 +0000

        SharpCompress DLL version comment added.

    commit 48be75f
    Author: Paul Woolcock <[email protected]>
    Date:   Wed Nov 17 00:18:17 2021 +0000

        Reverting SharpCompress.dll from v0.24.0 to v0.20.0
        Resolves #1341

    commit 282296c
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 14 18:06:55 2021 +0000

        Recreate backgroundWorker upon retry request.
        Logging changes.

    commit 4e414a1
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 14 17:41:28 2021 +0000

        Squashed merge commit of master branch for v2.9.2
        #1307

    commit 9fc14fa
    Merge: 5bf13d7 92ee440
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 14 16:34:15 2021 +0000

        Merge branch 'master' of https://github.com/phw198/OutlookGoogleCalendarSync

    commit 5bf13d7
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 14 16:29:39 2021 +0000

        v2.9.2

    commit bd12706
    Merge: 0488770 8542794
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Nov 14 13:10:31 2021 +0000

        Merge branch 'development' of https://github.com/phw198/OutlookGoogleCalendarSync into release

    commit 22503e7
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 13 22:09:33 2021 +0000

        Log OgcsMessageBox text.
        Only show "bulk delete" dialogue boxes if >1 item in calendar.

    commit 19ca3c7
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 13 21:54:32 2021 +0000

        Squashed commit of the following fixes #1335:

        commit 0fd0d02
        Author: Paul Woolcock <[email protected]>
        Date:   Sat Nov 13 12:35:40 2021 +0000

            Force reload of calendar dropdowns when profile type isn't changing.
            #1335

        commit b3ff284
        Author: Paul Woolcock <[email protected]>
        Date:   Sat Nov 6 11:17:02 2021 +0000

            Extra logging when picking profile.
            #1335

    commit d8b40f7
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Nov 8 21:06:55 2021 +0000

        ProfileManage() form added.
        #1307

    commit 0488770
    Merge: 204de71 3d4ba6d
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 6 18:09:43 2021 +0000

        Merge branch 'issue-1321' of https://github.com/phw198/OutlookGoogleCalendarSync into release
        Closes #1321

    commit 7fd41fe
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Nov 6 16:21:56 2021 +0000

        Update notification tray menu when adding/removing profiles.
        Queue syncs triggered from notification tray.
        New job Queue() class.
        #1307

    commit ec16901
    Merge: 746d2ed 204de71
    Author: Paul Woolcock <[email protected]>
    Date:   Wed Nov 3 23:42:40 2021 +0000

        Set Google calendar's default notification properly on Outlook appointment.
        Merge branch 'release' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 746d2ed
    Author: Paul Woolcock <[email protected]>
    Date:   Fri Oct 29 13:02:31 2021 +0100

        Remove restriction of only single instance of PushSyncTimer.
        Correctly set Add Attendees and Reminders checkboxes.
        Added "profile loading" banner.
        #1307

    commit 92ee440
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 30 21:43:30 2021 +0100

        Update README.md

    commit 204de71
    Merge: c186d34 0d8772d
    Author: Paul Woolcock <[email protected]>
    Date:   Fri Oct 29 14:25:20 2021 +0100

        Merge branch 'issue-1318' of https://github.com/phw198/OutlookGoogleCalendarSync into release
        Fixes #1318

    commit ebd24c1
    Author: Paul Woolcock <[email protected]>
    Date:   Thu Oct 28 01:10:39 2021 +0100

        Update dormant.yml

    commit 8dea7c9
    Author: Paul Woolcock <[email protected]>
    Date:   Thu Oct 28 01:05:27 2021 +0100

        Altered debug-only

    commit 7fb7c1c
    Author: Paul Woolcock <[email protected]>
    Date:   Thu Oct 28 00:31:35 2021 +0100

        Stopped storing MAPIFolder in Outlook.Calendar class.
        GetFolderByID() function to find MAPIFolder by profile entryID.
        Make sure using the correct Engine profile during sync.
        #1307

    commit 605c900
    Author: Paul Woolcock <[email protected]>
    Date:   Tue Oct 26 20:58:34 2021 +0100

        Handle active profile being set to null at end of sync.
        #1307

    commit ffb2e96
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Oct 24 18:06:52 2021 +0100

        Fix GUI update and selection of Outlook calendar when changing profile.
        #1307

    commit 3d4ba6d
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 23 21:56:20 2021 +0100

        Cause the window and taskbar icon to flash, not take focus.
        #1321

    commit 0d8772d
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 23 14:04:09 2021 +0100

        Set Google calendar's default notification properly on Outlook appointment.
        #1318

    commit 3300014
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 13:50:29 2021 +0100

        Update dormant.yml

    commit e59a480
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 13:31:37 2021 +0100

        Update dormant.yml

    commit 2d425ae
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 13:22:49 2021 +0100

        Update dormant.yml

    commit 0a81d40
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 13:10:18 2021 +0100

        Update dormant.yml

    commit 072ff30
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 13:04:58 2021 +0100

        Update dormant.yml

    commit 5156d32
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 16 12:48:31 2021 +0100

        Create dormant.yml

    commit 10b2a93
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Oct 10 18:41:03 2021 +0100

        v2.9.1.6
        Update GUI tab layout
        #1307

    commit 2246264
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Oct 9 22:25:44 2021 +0100

        Settings.Profile class
        #1307

    commit 8d1bf1b
    Author: Paul Woolcock <[email protected]>
    Date:   Tue Oct 5 22:16:34 2021 +0100

        Only retrieve Google colours if already authenticated.
        Improve logic for building full colour list dropdown in main form.
        Default to first Outlook colour in dropdown on map window.
        #1307

    commit d916f7a
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Oct 3 15:52:00 2021 +0100

        Calendar.profile.Equals() override.
        Bugfix: Duplication of dropdown items on profile change

    commit 0197fdf
    Author: Paul Woolcock <[email protected]>
    Date:   Fri Oct 1 17:29:23 2021 +0100

        v2.9.1.4
        #1307

    commit 5c72683
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Sep 26 14:14:21 2021 +0100

        Improved updating of the "test map" dropdowns
        Bugfixes

    commit c186d34
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Sep 25 21:34:13 2021 +0100

        Report error before application closes.
        #1295

    commit 51d8828
    Author: Paul Woolcock <[email protected]>
    Date:   Fri Sep 24 22:23:31 2021 +0100

        Merging multi-cal branch.

    commit 1d52dd3
    Author: Paul Woolcock <[email protected]>
    Date:   Tue Sep 21 23:25:16 2021 +0100

        Make sure extendedProperties contain an OGCS property in duplicateCheck()
        Fixes #1289

    commit 08d3e87
    Merge: 76f31a4 dc08c6e
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Sep 19 22:37:03 2021 +0100

        Merge branch 'master' v2.9.1 of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 76f31a4
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Sep 13 09:34:43 2021 +0100

        Squashed commit of the development branch.

    commit a5de142
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Sep 13 09:29:26 2021 +0100

        Squashed commit of v2.9.0 fixes on release branch.

    commit 205647f
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Sep 13 09:27:42 2021 +0100

        Merged v2.9.0 master branch.

    commit 51a8ec0
    Merge: 3972db7 fbaada1
    Author: Paul Woolcock <[email protected]>
    Date:   Sun Feb 28 17:41:41 2021 +0000

        Merge branch 'issue-1090' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 3972db7
    Merge: 38ba44a 4a1fe3f
    Author: Paul Woolcock <[email protected]>
    Date:   Sat Feb 27 22:37:01 2021 +0000

        Merge branch 'issue-1090' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 38ba44a
    Merge: 02a4839 5aed178
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Jan 11 21:41:12 2021 +0000

        Merge branch 'issue-1120' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 5aed178
    Author: Paul Woolcock <[email protected]>
    Date:   Mon Jan 11 21:38:13 2021 +0000

        Bugfix on calculating sync interval.
        #1120

    commit 02a4839
    Merge: 1aa0a25 82ff5fc
    Author: Paul Woolcock <[email protected]>
    Date:   Tue Dec 29 17:46:39 2020 +0000

        Merge branch 'issue-1120' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

    commit 1aa0a25
    Merge: 7718ab8 8bbb7f5
    Author: Paul Woolcock <[email protected]>
    Date:   Tue Dec 29 17:42:52 2020 +0000

        Merge branch 'issue-1051' of https://github.com/phw198/OutlookGoogleCalendarSync into dog-food

commit d540b98
Author: Paul Woolcock <[email protected]>
Date:   Sat Feb 5 16:13:31 2022 +0000

    Check if GetActiveObject() actually returns anything.
    #1379
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@phw198 phw198

Labels
enhancement New feature
Projects
None yet
Milestone
v2.9.4
Development

No branches or pull requests
3 participants
@phw198 @sunnykaul5 @BetonFPS