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.

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

[ADD] backport microsoft_calendar, microsoft_account #21

Open
wants to merge 14 commits into
base: 13.0
Choose a base branch
from

Conversation

hbrunn
Copy link
Member

@hbrunn hbrunn commented Jan 18, 2021

Most of the actual backport happens in calendar_v14, so that we have only few changes in microsoft_* in order to be able to easily cherry-pick upcoming changes in v14.

@hbrunn hbrunn force-pushed the 13.0-microsoft_calendar branch 2 times, most recently from ffe66e2 to 5ec7e64 Compare January 18, 2021 04:28
@hbrunn hbrunn force-pushed the 13.0-microsoft_calendar branch 2 times, most recently from ce5d1b4 to ce16947 Compare April 11, 2021 21:33
@github-actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Jan 16, 2022
@hbrunn hbrunn removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Feb 11, 2022
@hbrunn hbrunn marked this pull request as ready for review February 14, 2022 14:37
@hbrunn hbrunn force-pushed the 13.0-microsoft_calendar branch 10 times, most recently from bfc98cb to 6695783 Compare March 1, 2022 00:32
Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OM 👍

@hbrunn hbrunn force-pushed the 13.0-microsoft_calendar branch 3 times, most recently from e759bea to 758420d Compare November 14, 2022 17:42
@gurneyalex
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 13.0-ocabot-merge-pr-21-by-gurneyalex-bump-nobump, awaiting test results.

@hbrunn
Copy link
Member Author

hbrunn commented Jan 18, 2023

CI is fixed in #75

@gurneyalex
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

@gurneyalex The merge process could not start, because command `git merge --no-ff -m Merge PR #21 into 13.0

Signed-off-by gurneyalex tmp-pr-21` failed with output:

Auto-merging .pre-commit-config.yaml
CONFLICT (content): Merge conflict in .pre-commit-config.yaml
Auto-merging .github/workflows/test.yml
Auto-merging .copier-answers.yml
CONFLICT (content): Merge conflict in .copier-answers.yml
Automatic merge failed; fix conflicts and then commit the result.

@gurneyalex
Copy link
Member

@hbrunn could you rebase (and squash the fixup on your way?)

jbm-odoo and others added 14 commits January 18, 2023 11:47
TaskID 2223219

closes odoo/odoo#54936

Related: odoo/upgrade#1557
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
…` usage

PURPOSE

Clean code. Be more performance oriented.

SPECIFICATIONS

Improvements applied in this commit

  * not all() --> any(not) for earlier returns;
  * all([generator]) --> all(generator) to avoid unnecessary list casting.
    This code construct is better managed by all;

This commit will probably not have a big performance effect on standard
production databases. However each performance and cleaning improvement
is welcomed.

LINKS

Task ID-2328619

closes odoo/odoo#56060

Related: odoo/enterprise#12486
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Use the more convenient `cr.postcommit.add()` instead.

closes odoo/odoo#56990

Related: odoo/enterprise#12914
Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
Add a cron to sync events in Microsoft calendar
In Google and Microsoft calendar: remove 'sync with ...' button
when the synchronization is already activated, and replace it by a
badge.

closes odoo/odoo#57076

Taskid: 2329313
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Without demo data

closes odoo/odoo#56839

Related: odoo/enterprise#12821
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
@hbrunn
Copy link
Member Author

hbrunn commented Jan 18, 2023

@gurneyalex done

@houssine78
Copy link
Sponsor

Hi @gurneyalex could you try the merge command again ? :)

@dreispt
Copy link
Sponsor Member

dreispt commented May 2, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-21-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request May 2, 2024
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-21-by-dreispt-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet