Commit Graph

241 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 9c2d52a7f7 fix cascade delete in placeholder 2022-08-02 12:41:31 +02:00
Cayo Puigdefabregas 7e4deea7fe add unbinding 2022-07-29 17:02:27 +02:00
Cayo Puigdefabregas c98de60680 Merge branch 'testing' into feature/3598-binding 2022-07-29 10:05:49 +02:00
Cayo Puigdefabregas 637308ee8f drop required of imei and meid 2022-07-28 18:34:34 +02:00
Cayo Puigdefabregas 497e29a2da add manual binding 2022-07-28 17:48:14 +02:00
Cayo Puigdefabregas d0bfb9644d add phid and tags in labels 2022-07-21 13:56:09 +02:00
Cayo Puigdefabregas 2aafe9efcc remove add tag automaticaly 2022-07-20 10:33:44 +02:00
Cayo Puigdefabregas 1fa6e7512c fix tag automatic only for placeholder 2022-07-15 13:11:04 +02:00
Cayo Puigdefabregas fb31ce69bc fix models 2022-07-12 13:23:24 +02:00
Cayo Puigdefabregas e3ca632177 add components as placeholder 2022-07-12 11:23:55 +02:00
Cayo Puigdefabregas a21018a2d2 add binding relation 2022-07-11 15:36:45 +02:00
Cayo Puigdefabregas 1eed2f5773 remove schema of placeholder 2022-07-07 16:32:00 +02:00
Cayo Puigdefabregas bc8944a498 add manual edit placeholder 2022-07-05 18:09:47 +02:00
Cayo Puigdefabregas 71518ca2a5 add upload form placeholder 2022-07-04 11:26:24 +02:00
Cayo Puigdefabregas 12d55c2d24 add models 2022-06-28 17:38:05 +02:00
Cayo Puigdefabregas 35ccb33f34 Merge branch 'testing' into feature/3518-define-placeholder 2022-06-27 09:46:32 +02:00
Cayo Puigdefabregas be7cbf02c0 remove system uuid of public page 2022-06-23 17:06:40 +02:00
Cayo Puigdefabregas 2605d938e5 add placeholder model 2022-06-23 15:51:01 +02:00
Cayo Puigdefabregas 0f916e5964 change uuid for system_uuid 2022-06-15 12:17:16 +02:00
Cayo Puigdefabregas dd68c5c410 fix dev.sid 2022-06-08 11:59:22 +02:00
Cayo Puigdefabregas 5932213764 save sid in html label 2022-06-08 09:26:09 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
Cayo Puigdefabregas f2a7a15851 drop pdbs 2022-05-18 18:25:21 +02:00
Cayo Puigdefabregas 68fc1cb2bb resolv conflicts 2022-05-16 18:23:03 +02:00
Cayo Puigdefabregas dd081532ba #3402 change public page of device 2022-05-13 17:17:57 +02:00
Cayo Puigdefabregas 1b5f6412f0 #3397 add columns of status in the devices list 2022-05-13 12:17:14 +02:00
Cayo Puigdefabregas e34b591690 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 13:32:32 +02:00
Cayo Puigdefabregas 1023f3fdca add public link in model 2022-05-05 12:00:02 +02:00
Cayo Puigdefabregas d8a44c661a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-28 18:45:51 +02:00
Cayo Puigdefabregas 7362eb4492 add computer monitor 2022-04-28 17:56:00 +02:00
Cayo Puigdefabregas 3a5e806104 add icons types of devices in list of devices 2022-04-28 17:46:12 +02:00
Cayo Puigdefabregas 2c71d69a9a return to the origin of firewire 2022-03-29 13:34:01 +02:00
Cayo Puigdefabregas 90dea5492e change integer for string in firewire bios 2022-03-29 12:23:51 +02:00
Santiago L beb26ca232
Merge pull request #191 from eReuse/feature/server-side-render
Server side render - devicehub v2.0.0-alpha
2022-03-15 14:59:01 +01:00
Cayo Puigdefabregas b737aaf50a add verbose_name in device.model instead of use template system 2022-03-04 13:31:33 +01:00
Cayo Puigdefabregas d25c9faf25 fix change #2825, tags only for Computers 2022-03-03 10:43:34 +01:00
Cayo Puigdefabregas 8149d0ed7c reversed actions for see the better the traceability log 2022-02-02 13:27:53 +01:00
Cayo Puigdefabregas 3b41ddb66a Merge branch 'testing' into feature/delete-devices 2021-11-19 12:07:14 +01:00
Cayo Puigdefabregas 8e47af8e27 refactoring trading and trading for web 2021-11-12 10:00:43 +01:00
Cayo Puigdefabregas 872a0be866 rebuild trading function 2021-11-11 22:08:28 +01:00
Cayo Puigdefabregas 54977d432d refactory in delete_from_trade function 2021-11-11 17:06:26 +01:00
Cayo Puigdefabregas 9dc79a59dc fixing revokeView and reset_owner 2021-11-10 18:59:44 +01:00
Cayo Puigdefabregas f06007e199 fixing conflict 2021-11-08 18:07:07 +01:00
Cayo Puigdefabregas 56df40c81a fixing actions for computer 2021-11-04 13:27:25 +01:00
Cayo Puigdefabregas 6de83ce4d2 Fixing order of actions_multiple devices 2021-11-04 11:58:15 +01:00
Cayo Puigdefabregas 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +01:00
Cayo Puigdefabregas 283f869b4d drop remove 2021-10-28 12:19:49 +02:00
Cayo Puigdefabregas 03238acb9f fixing session in listener 2021-10-26 16:35:41 +02:00
Cayo Puigdefabregas 5861d2fd6f fixing session in listener 2021-10-26 16:21:05 +02:00
Cayo Puigdefabregas 1c2f6ba92c fixing tests 2021-10-23 13:02:10 +02:00
Cayo Puigdefabregas 9faa1697a7 fixing event device 2021-10-22 21:14:10 +02:00
Cayo Puigdefabregas 6091f31c17 adding event instead of reuse create_code function 2021-10-22 19:26:27 +02:00
Cayo Puigdefabregas 2ade5a14d4 adding tag when there are a new device 2021-10-22 14:19:42 +02:00
Cayo Puigdefabregas 5ec005e63b resolve conflict 2021-10-18 11:47:55 +02:00
Cayo Puigdefabregas 0eed8330ce adding metrics for documents 2021-10-15 15:04:58 +02:00
Cayo Puigdefabregas 5e9b9bf08d new metrics 2021-10-14 12:56:33 +02:00
Cayo Puigdefabregas aa7a3ffe12 Merge branch 'feature/new-recycling-action' into feature/new-metrix 2021-10-11 14:11:59 +02:00
Cayo Puigdefabregas 35e891bf5d trace in metrics 2021-10-11 14:11:56 +02:00
Cayo Puigdefabregas 007e9a96c6 Merge branch 'testing' into feature/new-recycling-action 2021-10-06 12:49:42 +02:00
Cayo Puigdefabregas fbf74643e9 resolve conflict 2021-10-06 12:11:05 +02:00
Cayo Puigdefabregas 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +02:00
Cayo Puigdefabregas 84da94430e fixing bug 2021-09-28 15:44:25 +02:00
Cayo Puigdefabregas f10f2b848f get the status and history status of one devices 2021-09-28 13:05:58 +02:00
Cayo Puigdefabregas bfe56a8626 DataWipe instead of ToErased 2021-07-29 12:45:43 +02:00
Cayo Puigdefabregas bb3145f3d8 fixing test_basic 2021-07-28 15:59:11 +02:00
Cayo Puigdefabregas 4b4c0a1480 fixing owner_id in computer 2021-07-05 12:29:21 +02:00
Cayo Puigdefabregas 8a797f079b fixing models and build views for revokeDocument 2021-06-24 19:09:12 +02:00
Cayo Puigdefabregas 21cdcb5350 simplify the algorithm for to manager the confirms flow 2021-06-07 10:50:08 +02:00
Cayo Puigdefabregas 80e74b6d3d fixing supplier and receiver 2021-06-04 19:27:01 +02:00
Cayo Puigdefabregas a0824f986b not allow than other users can insert devices, show better the status of trade for devices 2021-06-03 19:05:57 +02:00
Cayo Puigdefabregas 6142b89f41 adding confirm_status in devices 2021-05-27 15:56:10 +02:00
Cayo Puigdefabregas 2b60af8b08 fixing tests and property url of device 2021-03-09 12:54:57 +01:00
Cayo Puigdefabregas b83563e0ea swap SystemID for DevicehubID 2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas 840674e83b devicehubID instead of code 2021-03-08 19:09:12 +01:00
Cayo Puigdefabregas ff964bfe0a fixing path to hashcode 2021-03-08 13:22:37 +01:00
Cayo Puigdefabregas 06dfb9e31e adding hashcode 2021-03-08 13:06:07 +01:00
Cayo Puigdefabregas 083ce4e660 show code in web 2021-03-04 19:24:05 +01:00
Cayo Puigdefabregas bf5cae5f96 adding the create code function from ids of devices 2021-03-04 13:27:29 +01:00
Cayo Puigdefabregas 41cadcc0b3 try execute create_code 2021-03-04 10:19:31 +01:00
Cayo Puigdefabregas 269550270f add code in device and add listener 2021-03-03 20:05:48 +01:00
Cayo Puigdefabregas 8899b40408 fixed live report 2021-02-15 10:24:22 +01:00
Cayo Puigdefabregas 30246d6be5 fixing metrics 2021-02-12 20:22:04 +01:00
Cayo Puigdefabregas 7ef2a68d39 fixed 2021-02-12 20:06:20 +01:00
Cayo Puigdefabregas df42c27f20 remove EreusePrice of public info of devices 2021-02-12 10:29:23 +01:00
Cayo Puigdefabregas 1fff5cd32e add format to numbers and remove some datas 2021-02-11 20:00:57 +01:00
Cayo Puigdefabregas 72466003d0 drop all ethereum_address in the system 2021-02-10 13:05:43 +01:00
Cayo Puigdefabregas cb3f07eb5a change deposit for amount 2021-02-05 13:21:20 +01:00
Cayo Puigdefabregas fe824cc4fa drop deliverynote_address 2021-02-04 13:06:51 +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 8b8ff2d2c1 refixed bug 2021-01-14 18:18:59 +01:00
Cayo Puigdefabregas ae596e2a49 fixing bug 2021-01-14 18:10:50 +01:00
Cayo Puigdefabregas d974d3d78f ereuse_devicehub/resources/action/models.py 2021-01-14 17:32:03 +01:00
Cayo Puigdefabregas 12f28ba76f metrics in csv 2021-01-13 18:11:41 +01:00
Cayo Puigdefabregas af1cb704d5 fixing aspect_ratio 2020-12-17 16:52:42 +01:00
Cayo Puigdefabregas 882da7b9b1 . 2020-12-17 16:03:10 +01:00
Cayo Puigdefabregas b8812f0b82 change required for display, functionality and apparence 2020-12-17 13:08:06 +01:00
Cayo Puigdefabregas 5241c73a98 not required chassis in all system 2020-12-17 10:45:01 +01:00