Merge branch 'master' into dev_JSC_20220120_collections (214ffa46) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

214ffa46

Commit 214ffa46 authored 3 years ago by Jean-Sébastien Caux

Downloads
- Plain Diff

Merge branch 'master' into dev_JSC_20220120_collections

parents 5953a278 2dc3915e

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

scipost_django/common/forms.py 0 additions, 113 deletions

scipost_django/common/forms.py
scipost_django/common/widgets.py 0 additions, 100 deletions

scipost_django/common/widgets.py
scipost_django/finances/forms.py 9 additions, 4 deletions

scipost_django/finances/forms.py
scipost_django/finances/templates/finances/timesheets.html 1 addition, 1 deletion

scipost_django/finances/templates/finances/timesheets.html
scipost_django/finances/views.py 3 additions, 3 deletions

scipost_django/finances/views.py
scipost_django/scipost/forms.py 1 addition, 34 deletions

scipost_django/scipost/forms.py
scipost_django/scipost/urls.py 0 additions, 5 deletions

scipost_django/scipost/urls.py
scipost_django/scipost/views.py 1 addition, 15 deletions

scipost_django/scipost/views.py
scipost_django/templates/search/search_old.html 0 additions, 120 deletions

scipost_django/templates/search/search_old.html

with 15 additions and 395 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository