Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 11, 2023

To improve the structure of the documentation, the "Miscellaneous" section should be limited as much as possible.

This commit:

  • renames "Calendars" into "Calendar" (as the app name)
  • moves the app from the "Miscellaneous" section to the "Productivity" section
  • fixes the wrong file structure to follow the toc (e.g. general/calendars/outlook/outlook_calendar -> productivity/calendar/outlook)

task-3217827

Forward-Port-Of: #4032

@robodoo
Copy link
Collaborator

robodoo commented Apr 11, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 11, 2023

@jcs-odoo cherrypicking of pull request #4032 failed.

stdout:

Auto-merging content/administration/maintain/azure_oauth.rst
Auto-merging content/applications/general.rst
CONFLICT (content): Merge conflict in content/applications/general.rst
Auto-merging content/applications/productivity.rst
Auto-merging content/applications/productivity/calendar/outlook.rst
CONFLICT (content): Merge conflict in content/applications/productivity/calendar/outlook.rst

stderr:

17:35:46.518651 git.c:455               trace: built-in: git cherry-pick a85d050f5584fbb79dc972292b2a163b17ac6887
error: could not apply a85d050f5... [MOV] calendar: "Calendar" app from "Misc" to "Productivity"
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

To improve the structure of the documentation, the "Miscellaneous"
section should be limited as much as possible.

This commit:
- renames "Calendars" into "Calendar" (as the app name)
- moves the app from the "Miscellaneous" section to the "Productivity"
  section
- fixes the wrong file structure to follow the toc
  (e.g. general/calendars/outlook/outlook_calendar -> productivity/calendar/outlook)

task-3217827
@jcs-odoo jcs-odoo force-pushed the 15.0-14.0-calendar-jcs-oQr8-fw branch from 02e5c99 to 2de686d Compare April 11, 2023 15:48
@C3POdoo C3POdoo requested review from a team April 11, 2023 15:50
@jcs-odoo jcs-odoo removed request for a team April 11, 2023 15:50
@jcs-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 11, 2023
To improve the structure of the documentation, the "Miscellaneous"
section should be limited as much as possible.

This commit:
- renames "Calendars" into "Calendar" (as the app name)
- moves the app from the "Miscellaneous" section to the "Productivity"
  section
- fixes the wrong file structure to follow the toc
  (e.g. general/calendars/outlook/outlook_calendar -> productivity/calendar/outlook)

task-3217827

closes #4109

Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
@robodoo robodoo temporarily deployed to merge April 11, 2023 20:31 Inactive
@robodoo robodoo closed this Apr 11, 2023
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.

3 participants