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

274364ca

Commit 274364ca authored 5 years ago by Robin Tissot

Downloads
- Plain Diff

Merge branch 'feature/import-zip' into 'feature/polygons'

Feature/import zip

See merge request !6

parents a52c8645 8bbb0243

No related branches found

No related tags found

3 merge requests!35Feature/load hyper,!8WIP: Refactor panels,!6Feature/import zip

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
app/Dockerfile 1 addition, 1 deletion

app/Dockerfile
app/apps/core/models.py 5 additions, 17 deletions

app/apps/core/models.py
app/apps/imports/README.md 162 additions, 0 deletions

app/apps/imports/README.md
app/apps/imports/parsers.py 9 additions, 6 deletions

app/apps/imports/parsers.py
app/apps/imports/templatetags/export_tags.py 6 additions, 0 deletions

app/apps/imports/templatetags/export_tags.py
app/apps/imports/tests.py 26 additions, 28 deletions

app/apps/imports/tests.py
app/escriptorium/templates/export/alto.xml 1 addition, 1 deletion

app/escriptorium/templates/export/alto.xml
app/escriptorium/templates/export/pagexml.xml 1 addition, 1 deletion

app/escriptorium/templates/export/pagexml.xml
app/requirements.txt 3 additions, 2 deletions

app/requirements.txt

with 215 additions and 57 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