Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 114
    • Merge Requests 114
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !1249

Open
Opened Aug 25, 2020 by Ludovic Kiefer@ludovic.kiefer1
  • Report abuse
Report abuse

WIP: Officejs Slideshow Editor

Improve the Officejs Slideshow Editor application. It continues the work done on my reveal_editor branch.

Test results for this MR

TODO /cc @rporchetto @romain

Edited Aug 25, 2020 by Ludovic Kiefer

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/ludovic.kiefer/erp5.git officejs_slideshow_editor
git checkout -b ludovic.kiefer/erp5-officejs_slideshow_editor 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 ludovic.kiefer/erp5-officejs_slideshow_editor

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.

  • Discussion 0
  • Commits 11
  • Changes 73
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1249
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号