Merge branch 'develop' into add_item_frontent
Conflicts: django/website/hid/templates/hid/add_edit_item.html django/website/hid/tests/add_edit_item_view_tests.py django/website/hid/views/item.py
No related branches found
No related tags found
Showing
- django/website/hid/forms/item.py 2 additions, 2 deletionsdjango/website/hid/forms/item.py
- django/website/hid/templates/hid/add_edit_item.html 3 additions, 3 deletionsdjango/website/hid/templates/hid/add_edit_item.html
- django/website/hid/tests/add_edit_form_tests.py 12 additions, 0 deletionsdjango/website/hid/tests/add_edit_form_tests.py
- django/website/hid/tests/add_edit_item_view_tests.py 137 additions, 7 deletionsdjango/website/hid/tests/add_edit_item_view_tests.py
- django/website/hid/tests/views_tests.py 7 additions, 0 deletionsdjango/website/hid/tests/views_tests.py
- django/website/hid/views/item.py 35 additions, 22 deletionsdjango/website/hid/views/item.py
- django/website/rest_api/serializers.py 10 additions, 0 deletionsdjango/website/rest_api/serializers.py
- django/website/rest_api/tests/categorize_items_tests.py 1 addition, 3 deletionsdjango/website/rest_api/tests/categorize_items_tests.py
- django/website/rest_api/tests/delete_all_terms_tests.py 1 addition, 3 deletionsdjango/website/rest_api/tests/delete_all_terms_tests.py
- django/website/rest_api/tests/item_update_tests.py 104 additions, 0 deletionsdjango/website/rest_api/tests/item_update_tests.py
- django/website/rest_api/tests/taxonomy_and_term_create_tests.py 9 additions, 12 deletions.../website/rest_api/tests/taxonomy_and_term_create_tests.py
- django/website/rest_api/tests/term_itemcount_tests.py 1 addition, 3 deletionsdjango/website/rest_api/tests/term_itemcount_tests.py
- django/website/rest_api/urls.py 3 additions, 3 deletionsdjango/website/rest_api/urls.py
- django/website/transport/items.py 30 additions, 38 deletionsdjango/website/transport/items.py
- django/website/transport/taxonomies.py 2 additions, 13 deletionsdjango/website/transport/taxonomies.py
- django/website/transport/terms.py 1 addition, 12 deletionsdjango/website/transport/terms.py
- django/website/transport/tests/item_detail_tests.py 12 additions, 1 deletiondjango/website/transport/tests/item_detail_tests.py
- django/website/transport/tests/item_list_tests.py 1 addition, 1 deletiondjango/website/transport/tests/item_list_tests.py
- django/website/transport/tests/item_update_tests.py 33 additions, 0 deletionsdjango/website/transport/tests/item_update_tests.py
Loading
Please register or sign in to comment