Mentions légales du service

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

eScriptorium
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

A GitLab upgrade is scheduled for Monday, June 30, 2025. The service will be unavailable for a few minutes in the morning. We'll keep you posted on the progress of the upgrade on the Mattermost channel: https://mattermost.inria.fr/devel/channels/gitlab. We recommend that you do not work on the platform until an announcement indicates that maintenance is complete.

d6a92cbf

Commit d6a92cbf authored 4 years ago by Robin Tissot

Downloads
- Plain Diff

Merge branch 'develop'

parents 83ec1e1d 2983b057

Branches

Tags

1 merge request!52Api model

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/Dockerfile 1 addition, 1 deletion

app/Dockerfile
app/apps/api/views.py 1 addition, 1 deletion

app/apps/api/views.py
app/apps/bootstrap/templatetags/bootstrap.py 2 additions, 0 deletions

app/apps/bootstrap/templatetags/bootstrap.py
app/apps/core/models.py 19 additions, 14 deletions

app/apps/core/models.py
app/escriptorium/templates/core/wizards/import_pdf.html 2 additions, 1 deletion

app/escriptorium/templates/core/wizards/import_pdf.html
app/escriptorium/templates/django/forms/widgets/field.html 8 additions, 4 deletions

app/escriptorium/templates/django/forms/widgets/field.html
app/requirements.txt 2 additions, 1 deletion

app/requirements.txt

with 35 additions and 22 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