Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

fd47d1e7

Commit fd47d1e7 authored 9 years ago by Martin Burchell

Downloads
- Plain Diff

Merge branch 'develop' into last_modified

Conflicts:
	django/website/data_layer/tests/item_tests.py

parents 60367227 809d68d4

Branches

No related tags found

1 merge request!7Data Layer updates a "last edit date" field on the Item

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

django/website/data_layer/tests/item_tests.py 34 additions, 4 deletions

django/website/data_layer/tests/item_tests.py
django/website/hid/tests/categorize_items_tests.py 27 additions, 0 deletions

django/website/hid/tests/categorize_items_tests.py
django/website/rest_api/tests/categorize_items_tests.py 18 additions, 0 deletions

django/website/rest_api/tests/categorize_items_tests.py
django/website/rest_api/views.py 9 additions, 3 deletions

django/website/rest_api/views.py
django/website/taxonomies/models.py 4 additions, 1 deletion

django/website/taxonomies/models.py
django/website/transport/items.py 2 additions, 0 deletions

django/website/transport/items.py
django/website/transport/tests/item_add_term_tests.py 17 additions, 3 deletions

django/website/transport/tests/item_add_term_tests.py

with 111 additions and 11 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

Webarchitects | Forum | Status | SSH Fingerprints