Merge branch 'dev_JSC_20181002_expansion'
No related branches found
No related tags found
Showing
- finances/admin.py 3 additions, 1 deletionfinances/admin.py
- finances/constants.py 38 additions, 0 deletionsfinances/constants.py
- finances/migrations/0002_subsidy.py 34 additions, 0 deletionsfinances/migrations/0002_subsidy.py
- finances/migrations/0003_auto_20181007_1647.py 20 additions, 0 deletionsfinances/migrations/0003_auto_20181007_1647.py
- finances/migrations/0004_auto_20181007_2016.py 20 additions, 0 deletionsfinances/migrations/0004_auto_20181007_2016.py
- finances/models.py 35 additions, 0 deletionsfinances/models.py
- finances/templates/finances/_subsidy_card.html 42 additions, 0 deletionsfinances/templates/finances/_subsidy_card.html
- finances/templates/finances/base.html 15 additions, 0 deletionsfinances/templates/finances/base.html
- finances/templates/finances/finances.html 24 additions, 0 deletionsfinances/templates/finances/finances.html
- finances/templates/finances/subsidy_confirm_delete.html 30 additions, 0 deletionsfinances/templates/finances/subsidy_confirm_delete.html
- finances/templates/finances/subsidy_detail.html 22 additions, 0 deletionsfinances/templates/finances/subsidy_detail.html
- finances/templates/finances/subsidy_form.html 23 additions, 0 deletionsfinances/templates/finances/subsidy_form.html
- finances/templates/finances/subsidy_list.html 68 additions, 0 deletionsfinances/templates/finances/subsidy_list.html
- finances/urls.py 45 additions, 3 deletionsfinances/urls.py
- finances/views.py 55 additions, 2 deletionsfinances/views.py
- journals/models.py 11 additions, 1 deletionjournals/models.py
- journals/templates/journals/publication_detail.html 169 additions, 133 deletionsjournals/templates/journals/publication_detail.html
- journals/views.py 1 addition, 0 deletionsjournals/views.py
- notifications/templates/notifications/partials/notification_list_popover.html 5 additions, 2 deletions...tes/notifications/partials/notification_list_popover.html
- organizations/models.py 32 additions, 8 deletionsorganizations/models.py
Loading
Please register or sign in to comment