Upgrade Notebook OfficeJS app
This work resumes the MR !915 (closed)
Note: notebook export to pdf action relies on changes on erp5_notebook bt done in this MR: erp5-bin!6 (merged)
It also migrates the app to latest officejs framework.
This work resumes the MR !915 (closed)
Note: notebook export to pdf action relies on changes on erp5_notebook bt done in this MR: erp5-bin!6 (merged)
It also migrates the app to latest officejs framework.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/rporchetto/erp5.git" "notebook_roque" git checkout -b "rporchetto/erp5-notebook_roque" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "rporchetto/erp5-notebook_roque"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.