search

mustang-im / mustang

Mustang - New full-featured desktop email, chat and video conference client
https://mustang.im
Other
8 stars 1 forks source link

EWS: Calendar and Contacts: Merge #85

Closed benbucksch closed 3 months ago

benbucksch commented 3 months ago

Branch ews-wip

Please

I've already merged the changes outside the EWS directories to master. I made a few changes, including some of those that we discussed. I haven't tested it, though, so please test it carefully (after you made the review changes on your end) and fix it appropriately. Then, make the PR.

benbucksch commented 3 months ago

@NeilRashbrook I've merge the branch ews-wip to master, with a few changes. Most of the review changes are still outstanding. Could you please still apply those. You can merge those review changes directly to master.

NeilRashbrook commented 3 months ago

The version of the branch that you merged was almost two weeks old, and I had already started working on the review changes, so I will need to work out which changes you already did and which changes are still left (e.g. #71).

benbucksch commented 3 months ago

The version of the branch that you merged was almost two weeks old, and I had already started working on the review changes

Oh, I'm sorry! Somehow, my git pull doesn't update the branches, neither adds new branches, nor updates existing ones. No idea why. That's why I didn't know what you had made changes.

Sorry that this caused you extra work. If this helps, the changes I made within the EWS* files were minimal and only to update to the other changes, e.g. mostly just renamed uid to calUID. So, you can simply overwrite all changes on master in these files with your newer versions from your branch. Please do keep my changes outside of the EWS files.