Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

977ddd94

Commit 977ddd94 authored 5 years ago by Hangzhi Yu

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into dev

parents 8cc7d6ee e5182527

No related branches found

No related tags found

1 merge request!86Merge school-apps

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

schoolapps/aub/admin.py 1 addition, 3 deletions

schoolapps/aub/admin.py
schoolapps/aub/filters.py 2 additions, 13 deletions

schoolapps/aub/filters.py
schoolapps/aub/models.py 27 additions, 8 deletions

schoolapps/aub/models.py
schoolapps/aub/templates/aub/archive.html 4 additions, 4 deletions

schoolapps/aub/templates/aub/archive.html
schoolapps/aub/templates/aub/check.html 3 additions, 3 deletions

schoolapps/aub/templates/aub/check.html
schoolapps/aub/templates/aub/details.html 5 additions, 2 deletions

schoolapps/aub/templates/aub/details.html
schoolapps/aub/templates/aub/index.html 3 additions, 3 deletions

schoolapps/aub/templates/aub/index.html
schoolapps/aub/views.py 9 additions, 14 deletions

schoolapps/aub/views.py
schoolapps/dashboard/models.py 2 additions, 2 deletions

schoolapps/dashboard/models.py
schoolapps/static/common/style.css 3 additions, 0 deletions

schoolapps/static/common/style.css

with 59 additions and 52 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