cayop
|
7a474eaf9e
|
Merge pull request #56 from eReuse/feature/config_decouple
add decouple to config the system
|
2020-09-29 11:33:15 +02:00 |
Cayo Puigdefabregas
|
ec671312db
|
add decouple to config the system
|
2020-09-29 09:42:05 +02:00 |
 Santiago L
|
bfb67b92dd
|
Merge pull request #55 from eReuse/feature/54-show-version-via-api
Show version via API
|
2020-09-25 09:28:48 +02:00 |
|
Cayo Puigdefabregas
|
fed6b57bbe
|
import __version__ instead of open file __init__
|
2020-09-22 11:57:39 +02:00 |
|
Cayo Puigdefabregas
|
6c45754710
|
fixing the default version
|
2020-09-22 11:36:01 +02:00 |
|
Cayo Puigdefabregas
|
66f963e90e
|
bugfix adding re in test
|
2020-09-21 11:48:48 +02:00 |
|
Cayo Puigdefabregas
|
7f9be17c92
|
change pkg_resources for open __init__ in test too
|
2020-09-21 11:46:02 +02:00 |
|
Cayo Puigdefabregas
|
ea6691247a
|
change pkg_resources for open __init__
|
2020-09-21 11:34:55 +02:00 |
|
Cayo Puigdefabregas
|
773bf3a200
|
fixing test_basic
|
2020-09-21 11:14:50 +02:00 |
|
Cayo Puigdefabregas
|
aaaf118028
|
adding test of get version
|
2020-09-18 11:32:20 +02:00 |
|
Cayo Puigdefabregas
|
3d171626f3
|
adding logger info when the connection is fail
|
2020-09-18 11:05:42 +02:00 |
|
Cayo Puigdefabregas
|
c21d54dcb5
|
adding version in __init__.py instead of setup.py
|
2020-09-17 21:48:57 +02:00 |
|
Cayo Puigdefabregas
|
51f51b1e92
|
get version of ereuse-tag
|
2020-09-17 21:09:22 +02:00 |
|
Cayo Puigdefabregas
|
255701467a
|
fixing name of VersionView
|
2020-09-16 17:40:16 +02:00 |
|
Cayo Puigdefabregas
|
5cb0dad77d
|
add VersionView as view
|
2020-09-15 17:44:12 +02:00 |
|
Cayo Puigdefabregas
|
f8e6020be6
|
endpoint versions
|
2020-09-15 13:22:28 +02:00 |
nad
|
9fa96c3d3b
|
Revert "Changing devices transfer_states on delivery note PATCH"
This reverts commit 5c562752
|
2020-08-25 15:57:17 +02:00 |
|
nad
|
5c56275228
|
Changing devices transfer_states on delivery note PATCH
|
2020-08-25 15:31:15 +02:00 |
Jordi Nadeu
|
927594f7a7
|
Merge pull request #50 from eReuse/feature/endpoints
Adding basic tests endpoints
|
2020-08-25 10:25:04 +02:00 |
|
Jordi Nadeu
|
c11844ed51
|
Merge pull request #49 from eReuse/feature/33-export-lot-description
Feature/33 export lot description
|
2020-08-18 21:21:17 +02:00 |
|
nad
|
306bad966b
|
Adding lot permissions to LotsDocumentView
|
2020-08-18 21:02:54 +02:00 |
|
nad
|
b61398ee59
|
Adding two users on test_get_document_lots to check lot permissions
|
2020-08-18 21:02:47 +02:00 |
|
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 |
|
Cayo Puigdefabregas
|
a2b2be77f4
|
fixing get_device permissions
|
2020-08-18 12:35:04 +02:00 |
|
Cayo Puigdefabregas
|
3e653ee190
|
Merge branch 'testing' into feature/endpoints
|
2020-08-18 12:15:50 +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 |
|
Cayo Puigdefabregas
|
86cd36f3f8
|
change name of test_create_tag for test_get_tag
|
2020-08-17 18:46:44 +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 |
|
Cayo Puigdefabregas
|
2461a7c73f
|
test endpoints
|
2020-08-17 12:51:38 +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 |