8000 feat: add video conferencing option (Google Meet) to Google Calendar integration (backport #17851) by mergify[bot] · Pull Request #18456 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: add video conferencing option (Google Meet) to Google Calendar integration (backport #17851) #18456

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

Merged
merged 3 commits into from
Nov 1, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Oct 18, 2022

This is an automatic backport of pull request #17851 done by Mergify.

…integration (#17851)

* feat: add video conferencing (via google meet) for events syncing with google calendar

* fix: unset add_video_conferencing if sync_with_google_calendar not enabled

* fix: remove conference data if add_video_conferencing disabled during update

* fix: restrict add conferencing if event_category in Event, Meeting and Other

* fix: save meet link while pulling from calendar
updated response API Response comment with conference details
show google calendar section if pulled from google calendar

* feat: show link to join video conference with google meet

* fix(style): linter errors

* fix(style): linter errors

* fix: set conferenceDataVersion 1 only if google meet conferencing enabled
remove google meet link from event needs both conferenceData as null and conferenceDataVersion 1

* Update frappe/desk/doctype/event/event.py

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* Update frappe/desk/doctype/event/event.json

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: handle empty ends_on, use starts_on

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: do not update Event modified time on db set meet link

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: add email field event participants table
set email from linked contact
google calendar event to use event participant email as attendees

* fix: attendees not cleared from google calendar event

* fix(style): linter suggestions

* fix: make email field non-read only, called set_participants_email from before_save hook

* test: update new no of fields in event doctype in test_fetch_to_customize

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
(cherry picked from commit c44e278)

# Conflicts:
#	frappe/desk/doctype/event_participants/event_participants.json
@mergify mergify bot requested a review from a team October 18, 2022 16:35
@mergify mergify bot added the conflicts label Oct 18, 2022
@mergify mergify bot requested review from shariquerik and removed request for a team October 18, 2022 16:35
@ankush ankush removed the request for review from shariquerik October 19, 2022 05:22
@phot0n phot0n marked this pull request as draft October 19, 2022 10:12
@stale stale bot added the inactive label Oct 26, 2022
@stale stale bot closed this Oct 31, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-17851 branch October 31, 2022 19:52
@ankush ankush restored the mergify/bp/version-14-hotfix/pr-17851 branch November 1, 2022 05:12
@ankush ankush reopened this Nov 1, 2022
@stale stale bot removed the inactive label Nov 1, 2022
@frappe frappe deleted a comment from stale bot Nov 1, 2022
@phot0n phot0n removed the conflicts label Nov 1, 2022
@phot0n phot0n marked this pull request as ready for review November 1, 2022 06:15
@phot0n phot0n merged commit b04a54c into version-14-hotfix Nov 1, 2022
@phot0n phot0n deleted the mergify/bp/version-14-hotfix/pr-17851 branch November 1, 2022 06:25
frappe-pr-bot pushed a commit that referenced this pull request Nov 1, 2022
# [14.14.0](v14.13.0...v14.14.0) (2022-11-01)

### Bug Fixes

* correct stacklevel for warnings ([#18633](#18633)) ([#18634](#18634)) ([17821f1](17821f1))
* **formatting:** use snake case for variable names ([32851ce](32851ce))
* handle exceptions thrown in post_schema_updates ([#18648](#18648)) ([#18663](#18663)) ([29a659a](29a659a))
* **insert_many:** list instead of set to maintain order ([#18641](#18641)) ([4c521b8](4c521b8))
* make module def custom checkbox readonly in prod mode ([#18698](#18698)) ([18fa732](18fa732))
* **router-js:** handle case when link is not of same host ([1b70ec4](1b70ec4))
* set proper cache key for singles when name is passed as `None` ([#18667](#18667)) ([#18668](#18668)) ([e32ba96](e32ba96))
* Signature form ([#18477](#18477)) ([8e4711b](8e4711b))
* Signature form (backport [#18477](#18477)) ([#18690](#18690)) ([34c1611](34c1611))
* support symlinked /files directory ([#18702](#18702)) ([7b8cbd0](7b8cbd0))
* use `async...await` when parsing route ([9c09c65](9c09c65))
* use `is_file_path_valid` instead of `is_safe_path` ([#18316](#18316)) ([#18642](#18642)) ([537966c](537966c))
* **UX:** Info message on workspace for better UX (backport [#18701](#18701)) ([#18703](#18703)) ([5ba85ec](5ba85ec))
* **UX:** session expiry explanation and defaults ([#18680](#18680)) ([#18685](#18685)) ([515f6c2](515f6c2))
* **UX:** warn about Etc/* timezones behaviour ([#18587](#18587)) ([#18588](#18588)) ([c8728f5](c8728f5))
* webform validation script not working ([ab2b8df](ab2b8df))

### Features

* add video conferencing option (Google Meet) to Google Calendar integration (backport [#17851](#17851)) ([#18456](#18456)) ([b04a54c](b04a54c))
* support list view for "show titles instead of name" ([#18060](#18060)) ([#18681](#18681)) ([64c2555](64c2555))

### Performance Improvements

* ensure cache works for `non_standard_user_types` when empty ([#18665](#18665)) ([#18669](#18669)) ([5f7928b](5f7928b))

### Reverts

* Revert "fix: use `is_file_path_valid` instead of `is_safe_path` (#18316) (#18642)" (#18696) ([a08c029](a08c029)), closes [#18316](#18316) [#18642](#18642) [#18696](#18696)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.14.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

stephenBDT pushed a commit to alias/frappe that referenced this pull request Nov 7, 2022
…integration (backport frappe#17851) (frappe#18456)

* feat: add video conferencing option (Google Meet) to Google Calendar integration (frappe#17851)

* feat: add video conferencing (via google meet) for events syncing with google calendar

* fix: unset add_video_conferencing if sync_with_google_calendar not enabled

* fix: remove conference data if add_video_conferencing disabled during update

* fix: restrict add conferencing if event_category in Event, Meeting and Other

* fix: save meet link while pulling from calendar
updated response API Response comment with conference details
show google calendar section if pulled from google calendar

* feat: show link to join video conference with google meet

* fix(style): linter errors

* fix(style): linter errors

* fix: set conferenceDataVersion 1 only if google meet conferencing enabled
remove google meet link from event needs both conferenceData as null and conferenceDataVersion 1

* Update frappe/desk/doctype/event/event.py

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* Update frappe/desk/doctype/event/event.json

show add_video_conferencing for events of all categories

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: handle empty ends_on, use starts_on

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: do not update Event modified time on db set meet link

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>

* fix: add email field event participants table
set email from linked contact
google calendar event to use event participant email as attendees

* fix: attendees not cleared from google calendar event

* fix(style): linter suggestions

* fix: make email field non-read only, called set_participants_email from before_save hook

* test: update new no of fields in event doctype in test_fetch_to_customize

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
(cherry picked from commit c44e278)

# Conflicts:
#	frappe/desk/doctype/event_participants/event_participants.json

* chore: resolve conflict

* fix: consider reference docname when reference doctype in contact when setting participant emails in event doctype

Co-authored-by: Anoop <anoop@earthianslive.com>
Co-authored-by: phot0n <ritwikpuri5678@gmail.com>
stephenBDT pushed a commit to alias/frappe that referenced this pull request Nov 7, 2022
# [14.14.0](frappe/frappe@v14.13.0...v14.14.0) (2022-11-01)

### Bug Fixes

* correct stacklevel for warnings ([frappe#18633](frappe#18633)) ([frappe#18634](frappe#18634)) ([17821f1](frappe@17821f1))
* **formatting:** use snake case for variable names ([32851ce](frappe@32851ce))
* handle exceptions thrown in post_schema_updates ([frappe#18648](frappe#18648)) ([frappe#18663](frappe#18663)) ([29a659a](frappe@29a659a))
* **insert_many:** list instead of set to maintain order ([frappe#18641](frappe#18641)) ([4c521b8](frappe@4c521b8))
* make module def custom checkbox readonly in prod mode ([frappe#18698](frappe#18698)) ([18fa732](frappe@18fa732))
* **router-js:** handle case when link is not of same host ([1b70ec4](frappe@1b70ec4))
* set proper cache key for singles when name is passed as `None` ([frappe#18667](frappe#18667)) ([frappe#18668](frappe#18668)) ([e32ba96](frappe@e32ba96))
* Signature form ([frappe#18477](frappe#18477)) ([8e4711b](frappe@8e4711b))
* Signature form (backport [frappe#18477](frappe#18477)) ([frappe#18690](frappe#18690)) ([34c1611](frappe@34c1611))
* support symlinked /files directory ([frappe#18702](frappe#18702)) ([7b8cbd0](frappe@7b8cbd0))
* use `async...await` when parsing route ([9c09c65](frappe@9c09c65))
* use `is_file_path_valid` instead of `is_safe_path` ([frappe#18316](frappe#18316)) ([frappe#18642](frappe#18642)) ([537966c](frappe@537966c))
* **UX:** Info message on workspace for better UX (backport [frappe#18701](frappe#18701)) ([frappe#18703](frappe#18703)) ([5ba85ec](frappe@5ba85ec))
* **UX:** session expiry explanation and defaults ([frappe#18680](frappe#18680)) ([frappe#18685](frappe#18685)) ([515f6c2](frappe@515f6c2))
* **UX:** warn about Etc/* timezones behaviour ([frappe#18587](frappe#18587)) ([frappe#18588](frappe#18588)) ([c8728f5](frappe@c8728f5))
* webform validation script not working ([ab2b8df](frappe@ab2b8df))

### Features

* add video conferencing option (Google Meet) to Google Calendar integration (backport [frappe#17851](frappe#17851)) ([frappe#18456](frappe#18456)) ([b04a54c](frappe@b04a54c))
* support list view for "show titles instead of name" ([frappe#18060](frappe#18060)) ([frappe#18681](frappe#18681)) ([64c2555](frappe@64c2555))

### Performance Improvements

* ensure cache works for `non_standard_user_types` when empty ([frappe#18665](frappe#18665)) ([frappe#18669](frappe#18669)) ([5f7928b](frappe@5f7928b))

### Reverts

* Revert "fix: use `is_file_path_valid` instead of `is_safe_path` (frappe#18316) (frappe#18642)" (frappe#18696) ([a08c029](frappe@a08c029)), closes [frappe#18316](frappe#18316) [frappe#18642](frappe#18642) [frappe#18696](frappe#18696)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0