Merge branch 'develop' into feature/project
Showing
- app/apps/api/serializers.py 19 additions, 13 deletionsapp/apps/api/serializers.py
- app/apps/api/tests.py 11 additions, 13 deletionsapp/apps/api/tests.py
- app/apps/api/views.py 1 addition, 1 deletionapp/apps/api/views.py
- app/apps/core/admin.py 12 additions, 1 deletionapp/apps/core/admin.py
- app/apps/core/forms.py 117 additions, 19 deletionsapp/apps/core/forms.py
- app/apps/core/migrations/0044_auto_20210520_1332.py 18 additions, 0 deletionsapp/apps/core/migrations/0044_auto_20210520_1332.py
- app/apps/core/migrations/0045_auto_20210521_1034.py 55 additions, 0 deletionsapp/apps/core/migrations/0045_auto_20210521_1034.py
- app/apps/core/migrations/0046_auto_20210521_1444.py 43 additions, 0 deletionsapp/apps/core/migrations/0046_auto_20210521_1444.py
- app/apps/core/migrations/0047_datamigration_share_doc_to_proj.py 81 additions, 0 deletions...s/core/migrations/0047_datamigration_share_doc_to_proj.py
- app/apps/core/migrations/0048_auto_20210521_1445.py 27 additions, 0 deletionsapp/apps/core/migrations/0048_auto_20210521_1445.py
- app/apps/core/models.py 17 additions, 5 deletionsapp/apps/core/models.py
- app/apps/core/tasks.py 7 additions, 8 deletionsapp/apps/core/tasks.py
- app/apps/core/tests/factory.py 5 additions, 2 deletionsapp/apps/core/tests/factory.py
- app/apps/core/tests/tasks.py 1 addition, 1 deletionapp/apps/core/tests/tasks.py
- app/apps/core/views.py 1 addition, 1 deletionapp/apps/core/views.py
- app/apps/imports/parsers.py 12 additions, 11 deletionsapp/apps/imports/parsers.py
- app/apps/users/urls.py 3 additions, 1 deletionapp/apps/users/urls.py
- app/apps/users/views.py 13 additions, 0 deletionsapp/apps/users/views.py
- app/escriptorium/templates/core/document_part_edit.html 6 additions, 6 deletionsapp/escriptorium/templates/core/document_part_edit.html
- app/escriptorium/templates/users/profile.html 1 addition, 0 deletionsapp/escriptorium/templates/users/profile.html
Loading
Please register or sign in to comment