Merge branch 'master' into 'jbpasquier/slugs' (dd4ed577) · Commits · Fay Arnold / djangoldp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

djangoldp
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

dd4ed577

Commit dd4ed577 authored 5 years ago by Jean-Baptiste Pasquier

Downloads
- Plain Diff

Merge branch 'master' into 'jbpasquier/slugs'

# Conflicts:
#   djangoldp/models.py

parents bf297e9b 32f181ad

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

djangoldp/migrations/0002_auto_20190906_0642.py 6 additions, 5 deletions

djangoldp/migrations/0002_auto_20190906_0642.py
djangoldp/migrations/0003_auto_20190911_0931.py 21 additions, 0 deletions

djangoldp/migrations/0003_auto_20190911_0931.py
djangoldp/models.py 31 additions, 6 deletions

djangoldp/models.py
djangoldp/serializers.py 42 additions, 7 deletions

djangoldp/serializers.py
djangoldp/tests/models.py 29 additions, 3 deletions

djangoldp/tests/models.py
djangoldp/tests/runner.py 3 additions, 2 deletions

djangoldp/tests/runner.py
djangoldp/tests/tests_get.py 3 additions, 0 deletions

djangoldp/tests/tests_get.py
djangoldp/tests/tests_ldp_model.py 2 additions, 2 deletions

djangoldp/tests/tests_ldp_model.py
djangoldp/tests/tests_save.py 64 additions, 7 deletions

djangoldp/tests/tests_save.py
djangoldp/tests/tests_sources.py 1 addition, 1 deletion

djangoldp/tests/tests_sources.py
djangoldp/tests/tests_temp.py 1 addition, 6 deletions

djangoldp/tests/tests_temp.py
djangoldp/tests/tests_update.py 41 additions, 10 deletions

djangoldp/tests/tests_update.py
djangoldp/urls.py 1 addition, 1 deletion

djangoldp/urls.py
setup.cfg 1 addition, 0 deletions

setup.cfg

with 246 additions and 50 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