Commit graph

78 commits

Author SHA1 Message Date
Cayo Puigdefabregas 149255bcfe resolve conflicts 2021-04-16 18:16:07 +02:00
Cayo Puigdefabregas 70188f43a2 simplify get_token method 2021-04-15 21:21:41 +02:00
Cayo Puigdefabregas e1cca540c4 change verification link for erasure certificate doc 2021-04-13 19:02:16 +02:00
Cayo Puigdefabregas 21f019dc14 useing session table in wbconf 2021-04-13 18:33:49 +02:00
Cayo Puigdefabregas 7e4513f5d2 Merge branch 'testing' into feature/#128-endpoint-config-wb 2021-04-12 19:48:23 +02:00
Cayo Puigdefabregas 4704045da8 more easy to read 2021-04-12 19:34:33 +02:00
Cayo Puigdefabregas aa09413011 fixing review comments 2021-04-12 12:05:52 +02:00
Cayo Puigdefabregas ee55020f3c resolve conflict 2021-03-26 11:04:04 +01:00
Cayo Puigdefabregas b13d8e5b97 fixing merge 2021-03-16 20:50:57 +01:00
Cayo Puigdefabregas f9281fbdc0 Merge branch 'testing' into feature/#126-named-system-tags 2021-03-16 20:01:55 +01:00
Cayo Puigdefabregas 4d01e7f05d fixing bug unamed in csv 2021-03-16 15:43:42 +01:00
Cayo Puigdefabregas b83563e0ea swap SystemID for DevicehubID 2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas b902ab24f8 accept all type of docs 2021-03-08 13:19:35 +01:00
Cayo Puigdefabregas 6bb608b1a6 resolve confict 2021-03-04 10:51:20 +01:00
Cayo Puigdefabregas 372427375d correct response for every stamp check 2021-03-04 10:38:04 +01:00
Cayo Puigdefabregas 7e541f13a1 change env file name 2021-03-02 21:27:14 +01:00
Cayo Puigdefabregas 8f3c9c33cb adding the correct vars to env 2021-03-02 17:11:34 +01:00
Cayo Puigdefabregas 0d0005b315 adding file env for download 2021-03-02 11:42:07 +01:00
Cayo Puigdefabregas adb9a8e25a basic endpoint for wbconf 2021-03-01 19:21:57 +01:00
Cayo Puigdefabregas 4c08f65218 fixing internal stats 2021-02-23 17:40:36 +01:00
Cayo Puigdefabregas 79902ee26d adding lives action to the document of internal stats 2021-02-23 12:23:07 +01:00
Cayo Puigdefabregas 2a38070ae0 prepare auth for internal stats 2021-02-22 21:18:25 +01:00
Cayo Puigdefabregas d1b50cc212 simple internal stats 2021-02-22 15:49:13 +01:00
Cayo Puigdefabregas ce4dce055d basic endpoint for internal stats 2021-02-19 12:53:42 +01:00
Cayo Puigdefabregas 24669631ce adding hash for all documents than you download 2021-02-18 11:36:55 +01:00
Cayo Puigdefabregas b9bd367487 verify one document 2021-02-17 17:38:54 +01:00
Cayo Puigdefabregas 1a0287f8f9 adding documentId in csv of devices report 2021-02-07 18:16:43 +01:00
Cayo Puigdefabregas 6ca37e348c change erasure.html template 2021-01-26 13:52:23 +01:00
Cayo Puigdefabregas 5ae61d30bc adding systemId in metrics csv 2021-01-20 10:39:02 +01:00
Cayo Puigdefabregas f140c48359 fixing bug of lifetime 2021-01-19 16:06:46 +01:00
Cayo Puigdefabregas a7d51655b6 fixing url of link 2021-01-18 17:18:47 +01:00
Cayo Puigdefabregas 0273021d50 fixing title page 2021-01-18 12:48:54 +01:00
Cayo Puigdefabregas 1ec1eb39bf fixing test base 2021-01-18 12:40:31 +01:00
Cayo Puigdefabregas 3b2f09a37c static page for stamps 2021-01-18 10:54:50 +01:00
Cayo Puigdefabregas 12f28ba76f metrics in csv 2021-01-13 18:11:41 +01:00
Cayo Puigdefabregas 810a9b360c adding new endpoit for download csv of metrics 2021-01-08 17:37:52 +01:00
Cayo Puigdefabregas 96540d701c fixing lineterminator in csv 2020-12-21 16:09:30 +01:00
Cayo Puigdefabregas 3c12d1f75c add endpoint 2020-12-21 13:40:07 +01:00
Cayo Puigdefabregas db610d2853 insert hash3 when document is download 2020-12-21 11:34:03 +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
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
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