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

1b784057

Verified Commit 1b784057 authored 5 years ago by Nik | Klampfradler

Downloads
- Plain Diff

Merge branch 'master' into 113-add-django-dbsettings

parents fcdf402e efeaab19

No related branches found

No related tags found

1 merge request!63WIP: Resolve "Add django-dbsettings"

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 2 additions, 1 deletion

CHANGELOG.rst
CONTRIBUTING.rst 9 additions, 0 deletions

CONTRIBUTING.rst
biscuit/core/apps.py 1 addition, 12 deletions

biscuit/core/apps.py
biscuit/core/migrations/0001_initial.py 2 additions, 3 deletions

biscuit/core/migrations/0001_initial.py
biscuit/core/migrations/0002_school_term.py 1 addition, 2 deletions

biscuit/core/migrations/0002_school_term.py
biscuit/core/migrations/0004_yubi_otp.py 19 additions, 0 deletions

biscuit/core/migrations/0004_yubi_otp.py
biscuit/core/mixins.py 1 addition, 9 deletions

biscuit/core/mixins.py
biscuit/core/models.py 9 additions, 10 deletions

biscuit/core/models.py
biscuit/core/util/core_helpers.py 0 additions, 4 deletions

biscuit/core/util/core_helpers.py
biscuit/core/views.py 3 additions, 3 deletions

biscuit/core/views.py
dev.sh 1 addition, 0 deletions

dev.sh
docs/dev/01_setup.rst 30 additions, 6 deletions

docs/dev/01_setup.rst
docs/dev/02_install_apps.rst 2 additions, 8 deletions

docs/dev/02_install_apps.rst
docs/dev/03_run.rst 0 additions, 10 deletions

docs/dev/03_run.rst

with 80 additions and 68 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