Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

iric-data
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7da8bae1

Commit 7da8bae1 authored 5 months ago by Jean-Philippe Laverdure

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev into master

See merge request !117

parents 89069036 1c068855

No related branches found

No related tags found

1 merge request!117Dev into master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

portal/forms.py 5 additions, 0 deletions

portal/forms.py
portal/migrations/0034_datafile_filesize.py 29 additions, 0 deletions

portal/migrations/0034_datafile_filesize.py
portal/models.py 6 additions, 2 deletions

portal/models.py
portal/templates/portal/secure/user/datafile_list.html 32 additions, 4 deletions

portal/templates/portal/secure/user/datafile_list.html
portal/urls.py 83 additions, 47 deletions

portal/urls.py
portal/views/secure/datafile.py 143 additions, 65 deletions

portal/views/secure/datafile.py

with 298 additions and 118 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