nad
|
1fccea2bcc
|
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# tests/test_documents.py
|
2020-08-18 19:31:43 +02:00 |
|
nad
|
6087044a5e
|
Fixing test_get_multiple_lots and test_api_docs
|
2020-08-18 19:19:18 +02:00 |
|
nad
|
5c7444dc4d
|
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# ereuse_devicehub/resources/lot/views.py
# tests/test_documents.py
|
2020-08-18 11:23:50 +02:00 |
cayop
|
24578e7188
|
Merge pull request #48 from eReuse/feature/46-device-stock-control
Feature/46-device-stock-control
|
2020-08-17 18:11:48 +02:00 |
Jordi Nadeu
|
450817e430
|
Merge pull request #39 from eReuse/feature/27-permission-posting-action
feature/27-permission-posting-action
|
2020-08-17 16:52:00 +02:00 |
|
nad
|
a2a24f20cc
|
Reformat code following PEP8
|
2020-08-17 16:45:18 +02:00 |
|
nad
|
0bfc08f81f
|
Check snapshot permissions only when it comes from Workbench
|
2020-08-17 16:30:11 +02:00 |
|
nad
|
8c493da370
|
Merge remote-tracking branch 'origin/testing' into feature/27-permission-posting-action
|
2020-08-17 16:05:06 +02:00 |
|
nad
|
65ba42ada8
|
Fixing test_documents.py::test_export_basic_snapshot and test_documents.py::test_export_full_snapshot
|
2020-08-17 15:57:27 +02:00 |
|
Jordi Nadeu
|
b6138f9108
|
Merge branch 'testing' into feature/46-device-stock-control
|
2020-08-17 11:33:27 +02:00 |
|
nad
|
59932ba00d
|
Adding exceptions to device_row.py file
|
2020-08-17 11:18:52 +02:00 |
|
Jordi Nadeu
|
51ab2b78e4
|
Merge pull request #38 from eReuse/feature/22-device-lot-visibility
feature/22-device-lot-visibility
|
2020-08-12 12:10:28 +02:00 |
|
nad
|
c76c9d58f8
|
Deselect export tests for mvp
|
2020-08-12 11:59:12 +02:00 |
Cayo Puigdefabregas
|
f97b239abe
|
fixed bug diference model
|
2020-08-06 16:52:12 +02:00 |
|
Cayo Puigdefabregas
|
801a8a6c4a
|
add filter as user owner
|
2020-08-06 16:51:49 +02:00 |
|
Cayo Puigdefabregas
|
d973b479cf
|
return to put anonymous access to erasures documents
|
2020-08-06 15:55:14 +02:00 |
|
Cayo Puigdefabregas
|
27ab4cf2ef
|
user instead of client
|
2020-08-05 18:19:27 +02:00 |
|
Cayo Puigdefabregas
|
cdf36583a9
|
bug fixed: there is no point in having self.AUTH for view DocumentDef
|
2020-08-05 17:51:13 +02:00 |
|
nad
|
994f1d0e5f
|
Merge remote-tracking branch 'origin/testing' into feature/22-device-lot-visibility
|
2020-08-05 13:11:38 +02:00 |
|
nad
|
cc17a32e12
|
Merge branch 'feature/15-update-test-suite' into feature/22-device-lot-visibility
|
2020-08-05 13:09:03 +02:00 |
|
nad
|
e372811d6e
|
Merge branch 'testing' into feature/22-device-lot-visibility
# Conflicts:
# ereuse_devicehub/resources/device/views.py
|
2020-08-05 13:00:22 +02:00 |
|
Cayo Puigdefabregas
|
b90047bc4a
|
Merge branch 'feature/46-device-stock-control' of https://github.com/eReuse/devicehub-teal into feature/46-device-stock-control
|
2020-08-05 12:25:12 +02:00 |
|
Cayo Puigdefabregas
|
597ff3dc11
|
add check of permissions
|
2020-08-05 12:24:36 +02:00 |
|
Cayo Puigdefabregas
|
19bff82873
|
fixing spaces in csv file
|
2020-08-05 12:23:24 +02:00 |
|
Cayo Puigdefabregas
|
96026caabb
|
add new basic snapshot
|
2020-08-05 12:22:52 +02:00 |
|
Cayo Puigdefabregas
|
f424309c17
|
add second user as user2 in features in conftest
|
2020-08-05 12:22:06 +02:00 |
|
Jordi Nadeu
|
a052abc72d
|
Minor fix indentation error
|
2020-08-05 11:56:59 +02:00 |
|
Jordi Nadeu
|
eb859ce6c2
|
Fixing test_get_all_lots
|
2020-08-05 11:54:43 +02:00 |
|
Jordi Nadeu
|
04557905c8
|
Merge branch 'testing' into feature/46-device-stock-control
|
2020-08-05 11:49:18 +02:00 |
|
Jordi Nadeu
|
0318105e84
|
Merge pull request #44 from eReuse/feature/15-update-test-suite
Feature/15-update-test-suite
|
2020-08-05 11:44:48 +02:00 |
|
Cayo Puigdefabregas
|
49ea96b862
|
UniqueViolation intead of DBError in test_snapshot_upload_twice_uuid_error
|
2020-08-04 12:10:18 +02:00 |
|
Cayo Puigdefabregas
|
2f1d066162
|
add /document/stock/ to test_api_docs
|
2020-08-04 10:27:49 +02:00 |
|
nad
|
cb55312852
|
Fixing test_snapshot.py::test_snapshot_post_without_hid
|
2020-08-03 19:16:11 +02:00 |
|
nad
|
6017476822
|
Adding query to Lot views
|
2020-08-03 18:25:55 +02:00 |
|
nad
|
a2303498cd
|
Minors comments changes and new test_get_all_lots was added
|
2020-07-28 16:22:17 +02:00 |
|
nad
|
c0fcfcfdbf
|
Creating 'documents/lots/' endpoint
|
2020-07-28 16:16:17 +02:00 |
|
nad
|
b524ec7398
|
Creating export lots test
|
2020-07-28 16:14:56 +02:00 |
|
nad
|
322af04ff9
|
Creating new test for device stock control
|
2020-07-27 13:57:31 +02:00 |
|
nad
|
c90fa4e84e
|
Adding stock row class for new document endpoint
|
2020-07-27 13:56:56 +02:00 |
|
nad
|
936c042c62
|
Creating document stock endpoint
|
2020-07-23 20:55:27 +02:00 |
|
Cayo Puigdefabregas
|
1a6afe29d3
|
bugfix tag test with cli
|
2020-07-23 19:20:53 +02:00 |
|
Cayo Puigdefabregas
|
9e57b0aee7
|
new feature for shell. Create_client
|
2020-07-23 17:44:24 +02:00 |
|
Cayo Puigdefabregas
|
114613ddf7
|
document stock
|
2020-07-23 15:56:51 +02:00 |
|
Cayo Puigdefabregas
|
1b79f76e27
|
bugfix register desktop no hid no tags
|
2020-07-23 13:56:19 +02:00 |
|
Cayo Puigdefabregas
|
c87552964b
|
add xfail in test_sync_execute_register_desktop_no_hid_no_tag
|
2020-07-23 08:02:14 +02:00 |
|
Cayo Puigdefabregas
|
08b2fe90d0
|
bugfix: user before tag_id
|
2020-07-23 07:56:51 +02:00 |
|
Cayo Puigdefabregas
|
46b985e222
|
bugfix: defined owner_id in fixture tag_id
|
2020-07-22 18:40:27 +02:00 |
|
Cayo Puigdefabregas
|
dc24599075
|
bugfix: DBError insted of UniqueViolation in raise check
|
2020-07-22 15:41:04 +02:00 |
|
Cayo Puigdefabregas
|
b01c241685
|
bugfix econdary_workbench_link tag
|
2020-07-22 14:25:42 +02:00 |
|
Cayo Puigdefabregas
|
3179bba9e9
|
bugfix add owner_id when device is create
|
2020-07-22 14:22:42 +02:00 |