Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

beat.web
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

48e33ecf

Commit 48e33ecf authored 8 years ago by Jaden Diefenbaugh

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into post-demo-1-changes

Try to fix build issue via merging with upstream

parents 315acf22 afacf3c4

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

beat/web/algorithms/templates/algorithms/edition.html 3 additions, 4 deletions

beat/web/algorithms/templates/algorithms/edition.html
beat/web/backend/views.py 1 addition, 2 deletions

beat/web/backend/views.py
beat/web/experiments/static/experiments/js/panels.js 23 additions, 4 deletions

beat/web/experiments/static/experiments/js/panels.js
beat/web/toolchains/static/toolchains/js/editor.js 1 addition, 1 deletion

beat/web/toolchains/static/toolchains/js/editor.js
beat/web/toolchains/static/toolchains/js/models.js 30 additions, 1 deletion

beat/web/toolchains/static/toolchains/js/models.js
beat/web/toolchains/templates/toolchains/edition.html 4 additions, 0 deletions

beat/web/toolchains/templates/toolchains/edition.html
setup.py 1 addition, 1 deletion

setup.py

with 63 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment