Merge branch 'master' into rights
# Conflicts: # note_kfet/settings/base.py
Showing
- .gitignore 8 additions, 2 deletions.gitignore
- .gitlab-ci.yml 10 additions, 5 deletions.gitlab-ci.yml
- .pylintrc 0 additions, 379 deletions.pylintrc
- Dockerfile 18 additions, 0 deletionsDockerfile
- README.md 126 additions, 22 deletionsREADME.md
- apps/activity/__init__.py 1 addition, 2 deletionsapps/activity/__init__.py
- apps/activity/admin.py 2 additions, 3 deletionsapps/activity/admin.py
- apps/activity/api/__init__.py 0 additions, 0 deletionsapps/activity/api/__init__.py
- apps/activity/api/serializers.py 36 additions, 0 deletionsapps/activity/api/serializers.py
- apps/activity/api/urls.py 13 additions, 0 deletionsapps/activity/api/urls.py
- apps/activity/api/views.py 37 additions, 0 deletionsapps/activity/api/views.py
- apps/activity/apps.py 1 addition, 2 deletionsapps/activity/apps.py
- apps/activity/models.py 13 additions, 5 deletionsapps/activity/models.py
- apps/api/__init__.py 4 additions, 0 deletionsapps/api/__init__.py
- apps/api/apps.py 10 additions, 0 deletionsapps/api/apps.py
- apps/api/urls.py 51 additions, 0 deletionsapps/api/urls.py
- apps/logs/__init__.py 4 additions, 0 deletionsapps/logs/__init__.py
- apps/logs/apps.py 14 additions, 0 deletionsapps/logs/apps.py
- apps/logs/migrations/__init__.py 0 additions, 0 deletionsapps/logs/migrations/__init__.py
- apps/logs/models.py 71 additions, 0 deletionsapps/logs/models.py
Loading
Please register or sign in to comment