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 129
    • Merge Requests 129
  • 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
  • !1217

Open
Opened Jul 23, 2020 by Cédric Le Ninivin@cedric.leninivin
  • Report abuse
Report abuse

WIP: Cribjs bootloader

Add Basic CribJS Bootloader.

It will load the master branch of Crib Editor at the url containing the Bootloader.

Crib Editor provides basic functionnality to edit the content of the website directly inside the browser. It's a website that edit itself locally. You can then download your work as a zip file of exchange it with webtorrent.

You can test the Website at

  • https://cribjs.nexedi.net
  • https://foo.cribjs.nexedi.net
  • https://bar.cribjs.nexedi.net
  • https://work.cribjs.nexedi.net

There is a wildcard so any domain in *.cribjs.nexedi.net will work for you

Check out, review, and merge locally

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

git fetch origin
git checkout -b cribjs-bootloader origin/cribjs-bootloader

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 cribjs-bootloader

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 5
  • Changes 36
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1217
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7