Cayo Puigdefabregas
|
19279acaeb
|
clean view of merge
|
2020-10-27 19:13:31 +01:00 |
|
|
Cayo Puigdefabregas
|
ab1d268f14
|
rebuild the query for more post structured
|
2020-10-27 19:12:46 +01:00 |
|
|
Cayo Puigdefabregas
|
b10ed84836
|
adding columns rate when no there are rate
|
2020-10-23 10:27:16 +02:00 |
|
|
Cayo Puigdefabregas
|
20f2300ce1
|
modify the pull requirements
|
2020-10-22 15:54:01 +02:00 |
|
|
Cayo Puigdefabregas
|
1f4d30df32
|
rebuild rows with all new collumns
|
2020-10-21 22:11:55 +02:00 |
|
|
Cayo Puigdefabregas
|
ed2f71c150
|
add delimeter as ; in csv
|
2020-10-21 22:09:15 +02:00 |
|
|
Cayo Puigdefabregas
|
2f7c34af2e
|
graphic card
|
2020-10-21 13:17:32 +02:00 |
|
|
Cayo Puigdefabregas
|
e6401fff3c
|
cpus, rams, disks
|
2020-10-21 13:06:47 +02:00 |
|
|
Cayo Puigdefabregas
|
79b4c738e9
|
change the name of the file
|
2020-10-15 11:00:11 +02:00 |
|
|
Cayo Puigdefabregas
|
a702f2f9b3
|
Merge branch 'testing' into feature/61-Json-Backup
|
2020-10-14 11:41:02 +02:00 |
|
|
Cayo Puigdefabregas
|
d3ef6cc65d
|
add user to the name file of json and more readable date
|
2020-10-13 15:59:39 +02:00 |
|
|
Cayo Puigdefabregas
|
ae98d3154c
|
TMP_SNAPSHOTS defined in config file
|
2020-10-13 15:37:21 +02:00 |
|
|
Cayo Puigdefabregas
|
c1595aa305
|
clean imports unused
|
2020-10-13 14:44:44 +02:00 |
|
|
Cayo Puigdefabregas
|
49668a4f4f
|
open files using with statement
|
2020-10-09 20:54:12 +02:00 |
|
|
Cayo Puigdefabregas
|
99a12b2b22
|
bugfix
|
2020-10-09 20:40:22 +02:00 |
|
|
Cayo Puigdefabregas
|
2a53e1672c
|
using os.path.join instead of format
|
2020-10-09 20:29:02 +02:00 |
|
|
Cayo Puigdefabregas
|
f257f192e6
|
fixed bug
|
2020-10-09 11:35:16 +02:00 |
|
|
Cayo Puigdefabregas
|
382dd3373f
|
change response header html for json
|
2020-10-09 11:00:49 +02:00 |
|
|
Cayo Puigdefabregas
|
258c3b4efd
|
more simple patch in post view
|
2020-10-08 14:47:11 +02:00 |
|
|
Cayo Puigdefabregas
|
0e89af1215
|
catch all exceptions and save de snapshot
|
2020-10-07 19:58:09 +02:00 |
|
|
Cayo Puigdefabregas
|
56907e7055
|
fixed bug
|
2020-10-07 18:37:23 +02:00 |
|
|
Cayo Puigdefabregas
|
aed9e8c2d6
|
change name
|
2020-10-07 18:29:18 +02:00 |
|
|
Cayo Puigdefabregas
|
9a24eb5fd5
|
save snapshot in a temporal file
|
2020-10-07 18:28:57 +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
|
ea6691247a
|
change pkg_resources for open __init__
|
2020-09-21 11:34:55 +02:00 |
|
|
Cayo Puigdefabregas
|
3d171626f3
|
adding logger info when the connection is fail
|
2020-09-18 11:05:42 +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 |
|
|
nad
|
306bad966b
|
Adding lot permissions to LotsDocumentView
|
2020-08-18 21:02:54 +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 |
|
|
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 |
|
|
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 |
|
|
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
|
cdf36583a9
|
bug fixed: there is no point in having self.AUTH for view DocumentDef
|
2020-08-05 17:51:13 +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 |
|