Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

nopaque
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Service Desk
- Model experiments

Snippets Groups Projects

96520fa4

Commit 96520fa4 authored 2 years ago by Inga Kirschnick

Downloads
- Plain Diff

Merge branch 'following-mechanics' into development

parents ea48e479 bd6f9458

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/corpora/forms.py 4 additions, 0 deletions

app/corpora/forms.py
app/corpora/routes.py 74 additions, 5 deletions

app/corpora/routes.py
app/main/routes.py 6 additions, 2 deletions

app/main/routes.py
app/models.py 31 additions, 0 deletions

app/models.py
app/static/js/ResourceLists/CorpusFileList.js 1 addition, 1 deletion

app/static/js/ResourceLists/CorpusFileList.js
app/static/js/ResourceLists/UserList.js 5 additions, 5 deletions

app/static/js/ResourceLists/UserList.js
app/templates/_sidenav.html.j2 1 addition, 0 deletions

app/templates/_sidenav.html.j2
app/templates/corpora/corpus.html.j2 88 additions, 1 deletion

app/templates/corpora/corpus.html.j2
app/templates/main/dashboard.html.j2 28 additions, 0 deletions

app/templates/main/dashboard.html.j2
app/templates/users/profile.html.j2 18 additions, 0 deletions

app/templates/users/profile.html.j2

with 256 additions and 14 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