Merge branch 'develop'
Showing
- app/apps/api/serializers.py 1 addition, 1 deletionapp/apps/api/serializers.py
- app/apps/api/views.py 28 additions, 0 deletionsapp/apps/api/views.py
- app/apps/core/models.py 103 additions, 0 deletionsapp/apps/core/models.py
- app/apps/core/static/js/edit/components/source_panel.js 5 additions, 0 deletionsapp/apps/core/static/js/edit/components/source_panel.js
- app/apps/core/static/js/edit/components/trans_modal.js 102 additions, 42 deletionsapp/apps/core/static/js/edit/components/trans_modal.js
- app/apps/core/static/js/edit/store/part.js 15 additions, 0 deletionsapp/apps/core/static/js/edit/store/part.js
- app/apps/core/tasks.py 6 additions, 2 deletionsapp/apps/core/tasks.py
- app/apps/users/admin.py 4 additions, 3 deletionsapp/apps/users/admin.py
- app/apps/users/forms.py 93 additions, 8 deletionsapp/apps/users/forms.py
- app/apps/users/migrations/0011_groupowner.py 24 additions, 0 deletionsapp/apps/users/migrations/0011_groupowner.py
- app/apps/users/migrations/0012_create_group_owners.py 28 additions, 0 deletionsapp/apps/users/migrations/0012_create_group_owners.py
- app/apps/users/models.py 44 additions, 2 deletionsapp/apps/users/models.py
- app/apps/users/tests.py 69 additions, 2 deletionsapp/apps/users/tests.py
- app/apps/users/urls.py 15 additions, 3 deletionsapp/apps/users/urls.py
- app/apps/users/views.py 138 additions, 13 deletionsapp/apps/users/views.py
- app/escriptorium/static/css/escriptorium.css 5 additions, 1 deletionapp/escriptorium/static/css/escriptorium.css
- app/escriptorium/static/js/baseline.editor.js 1 addition, 1 deletionapp/escriptorium/static/js/baseline.editor.js
- app/escriptorium/templates/base.html 3 additions, 1 deletionapp/escriptorium/templates/base.html
- app/escriptorium/templates/core/document_part_edit.html 15 additions, 0 deletionsapp/escriptorium/templates/core/document_part_edit.html
- app/escriptorium/templates/users/email/invitation_subject.txt 1 addition, 1 deletion...escriptorium/templates/users/email/invitation_subject.txt
Loading
Please register or sign in to comment