Skip to content
a version control system for school environments and Snap! using Django and Cytoscape.js
Python HTML JavaScript Shell CSS Dockerfile Makefile
Branch: master
Clone or download
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
data/nginx updated docker settings for server Jul 5, 2019
snapmerge Merge branch 'master' of https://github.com/manzanillo/smerge Aug 9, 2019
.gitignore simple sync block that works in FF as well Jul 26, 2018
Dockerfile apply migrations and compress files when building docker Jul 5, 2019
LICENSE
Makefile added "open shell" to Makefile Jul 4, 2019
Pipfile made websocket Docker-ready Jul 5, 2019
README.md Update README.md Aug 8, 2019
docker-compose.yml updated docker settings for server Jul 5, 2019
entrypoint.sh apply migrations and compress files when building docker Jul 5, 2019
init-letsencrypt.sh added email adress Jul 5, 2019
package-lock.json updated npm packages Jul 3, 2019
package.json updated npm packages Jul 3, 2019

README.md

smerge

Smerge is a merge tool for school environments and Snap!. It is based on a lot of open source projects including cytoscape.js or Django. A live demo can be found at smerge.org

Rules

  • Simple
  • beautiful
  • fast

Install

You will need pip and Python 3 for installing smerge on your server. We recommend using pipenv and npm for local deployment. Use

pipenv install
npm install

and then the command

make run

In case, you have unapplied migrations, first run:

make migrate

Contributing

Thank you for considering contributing to smerge! It's as easy as creating a pull request.

License

smerge itself is licenced under the MIT license. Licence for third-party libraries may differ and those licences apply in those cases.

etc.

To import initial data use: manage.py loaddata snapmerge/fixtures/initial_data.json

You can’t perform that action at this time.