Merge remote-tracking branch 'origin/master' into activity
# Conflicts: # note_kfet/urls.py # templates/base.html
No related branches found
No related tags found
Showing
- .env_example 13 additions, 0 deletions.env_example
- .gitignore 1 addition, 1 deletion.gitignore
- .gitmodules 3 additions, 0 deletions.gitmodules
- Dockerfile 10 additions, 2 deletionsDockerfile
- README.md 45 additions, 27 deletionsREADME.md
- apps/activity/admin.py 1 addition, 1 deletionapps/activity/admin.py
- apps/activity/api/serializers.py 3 additions, 0 deletionsapps/activity/api/serializers.py
- apps/activity/api/views.py 13 additions, 5 deletionsapps/activity/api/views.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 40 additions, 2 deletionsapps/api/urls.py
- apps/api/viewsets.py 31 additions, 0 deletionsapps/api/viewsets.py
- apps/logs/__init__.py 4 additions, 0 deletionsapps/logs/__init__.py
- apps/logs/api/__init__.py 0 additions, 0 deletionsapps/logs/api/__init__.py
- apps/logs/api/serializers.py 19 additions, 0 deletionsapps/logs/api/serializers.py
- apps/logs/api/urls.py 11 additions, 0 deletionsapps/logs/api/urls.py
- apps/logs/api/views.py 23 additions, 0 deletionsapps/logs/api/views.py
- apps/logs/apps.py 18 additions, 0 deletionsapps/logs/apps.py
- apps/logs/migrations/__init__.py 0 additions, 0 deletionsapps/logs/migrations/__init__.py
- apps/logs/models.py 77 additions, 0 deletionsapps/logs/models.py
Loading
Please register or sign in to comment