Merge branch 'development'
No related branches found
No related tags found
Showing
- colleges/managers.py 5 additions, 1 deletioncolleges/managers.py
- colleges/permissions.py 2 additions, 6 deletionscolleges/permissions.py
- comments/constants.py 5 additions, 5 deletionscomments/constants.py
- comments/migrations/0004_auto_20180519_1313.py 20 additions, 0 deletionscomments/migrations/0004_auto_20180519_1313.py
- comments/models.py 18 additions, 1 deletioncomments/models.py
- comments/templates/comments/_comment_identifier.html 7 additions, 3 deletionscomments/templates/comments/_comment_identifier.html
- journals/forms.py 2 additions, 1 deletionjournals/forms.py
- journals/migrations/0027_auto_20180414_1627.py 21 additions, 0 deletionsjournals/migrations/0027_auto_20180414_1627.py
- journals/migrations/0028_merge_20180426_1023.py 16 additions, 0 deletionsjournals/migrations/0028_merge_20180426_1023.py
- journals/migrations/0029_merge_20180519_1308.py 16 additions, 0 deletionsjournals/migrations/0029_merge_20180519_1308.py
- package.json 2 additions, 2 deletionspackage.json
- production/utils.py 14 additions, 0 deletionsproduction/utils.py
- scipost/feeds.py 3 additions, 5 deletionsscipost/feeds.py
- scipost/management/commands/add_groups_and_permissions.py 5 additions, 3 deletionsscipost/management/commands/add_groups_and_permissions.py
- scipost/static/scipost/assets/config/preconfig.scss 1 addition, 2 deletionsscipost/static/scipost/assets/config/preconfig.scss
- scipost/static/scipost/assets/css/_cards.scss 0 additions, 11 deletionsscipost/static/scipost/assets/css/_cards.scss
- scipost/static/scipost/assets/css/_labels.scss 8 additions, 8 deletionsscipost/static/scipost/assets/css/_labels.scss
- scipost/static/scipost/assets/css/_tables.scss 8 additions, 3 deletionsscipost/static/scipost/assets/css/_tables.scss
- scipost/templates/partials/scipost/personal_page/submissions.html 1 addition, 1 deletion...templates/partials/scipost/personal_page/submissions.html
- scipost/views.py 4 additions, 4 deletionsscipost/views.py
Loading
Please register or sign in to comment