Commit Graph

1056 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 4b13995b4f . 2022-12-05 12:40:26 +01:00
Cayo Puigdefabregas e3f01f4795 fix 2022-12-05 09:58:12 +01:00
Cayo Puigdefabregas 94a586f00b filter correct values 2022-12-02 10:08:03 +01:00
Cayo Puigdefabregas 39f19f676b Merge branch 'testing' into changes/4025-new-hid 2022-12-01 15:59:52 +01:00
Cayo Puigdefabregas 8c979d7741 fix user register 2022-12-01 13:03:24 +01:00
Cayo Puigdefabregas a0e63b2ae9 Merge branch 'testing' into new-trublo 2022-12-01 10:20:39 +01:00
Cayo Puigdefabregas 7c6290bd89 add settings version to snapshots model 2022-11-30 16:25:11 +01:00
Cayo Puigdefabregas 4fa6f9f343 Merge branch 'testing' into feature/3999-setings 2022-11-30 16:13:33 +01:00
Cayo Puigdefabregas 0a6f9e3bf4 add settings_version to schema 2022-11-30 12:54:11 +01:00
cayop f49ba1f7ba
Merge pull request #413 from eReuse/bugfix/4124-documents-in-lot
fix orther without id
2022-11-30 11:27:27 +01:00
Cayo Puigdefabregas b1ad7b151d fix orther without id 2022-11-30 10:23:51 +01:00
Cayo Puigdefabregas 040421172f fix definition of others 2022-11-29 17:46:41 +01:00
Cayo Puigdefabregas c392270676 add others device 2022-11-29 16:49:23 +01:00
Cayo Puigdefabregas b84f379468 Merge branch 'testing' into feature/4094-add-new-fields 2022-11-29 10:09:10 +01:00
Cayo Puigdefabregas 789eb1b526 add register devices 2022-11-25 13:27:14 +01:00
Cayo Puigdefabregas e7cf069a33 add api_token 2022-11-24 18:00:16 +01:00
Cayo Puigdefabregas 88b13961fe add permitons to new users 2022-11-24 17:54:25 +01:00
Cayo Puigdefabregas 9d8fb6b04a add dlt keys to the model 2022-11-22 19:12:11 +01:00
Cayo Puigdefabregas ac535cc9b5 add new fields in the filters 2022-11-22 15:44:44 +01:00
Cayo Puigdefabregas 7bf879bbcf add my_partner for get the partner of one device 2022-11-22 11:59:31 +01:00
Cayo Puigdefabregas 35dd08c9c8 fixing add hdd to lot 2022-11-21 15:13:36 +01:00
Cayo Puigdefabregas a09e087b0e add tab for Hard drives without device 2022-11-21 13:24:56 +01:00
Cayo Puigdefabregas 905716f74b fix live view 2022-11-18 10:20:57 +01:00
Cayo Puigdefabregas f0ffe27671 fix device set_hid 2022-11-16 17:40:35 +01:00
Cayo Puigdefabregas d030ed9b23 set_old_hid 2022-11-16 13:47:50 +01:00
Cayo Puigdefabregas 236fcac0b8 add new hid in devices 2022-11-16 11:51:31 +01:00
Cayo Puigdefabregas 4df33e8808 remove user_registration 2022-11-08 13:32:29 +01:00
Cayo Puigdefabregas 41eb390e39 Merge branch 'master' into testing 2022-11-07 11:56:16 +01:00
Cayo Puigdefabregas 09a0a30386 fixing bug 2022-11-03 18:19:56 +01:00
Cayo Puigdefabregas 6c7ae1bb75 remove report of devicehub commands 2022-11-02 19:44:39 +01:00
Cayo Puigdefabregas eae036d7c0 remove internal stats of actual devicehub 2022-11-02 12:00:39 +01:00
Cayo Puigdefabregas 44985d07a1 add dhid as column in erasure section 2022-10-26 11:26:09 +02:00
Cayo Puigdefabregas 4c2f37dfec resolve conflict 2022-10-24 18:33:40 +02:00
Cayo Puigdefabregas 4fa4a4c553 fix text error 2022-10-24 17:58:25 +02:00
Cayo Puigdefabregas b73526768b 2 computers with diferents motherboard with the same system-uuid 2022-10-24 17:46:57 +02:00
Cayo Puigdefabregas c2d81b1b29 Merge branch 'testing' into feature/3729-user-registration 2022-10-18 17:15:28 +02:00
Cayo Puigdefabregas 106ab2f650 add tests and redirect from abstract device to twin page 2022-10-18 11:18:50 +02:00
Cayo Puigdefabregas fc297ee5f8 add is_server_erase in snapshot action 2022-10-17 18:07:16 +02:00
Cayo Puigdefabregas 6b173de5a8 setup kangaroo server 2022-10-13 18:21:44 +02:00
Cayo Puigdefabregas 7775208b28 add prefix to lots name in the list of devices 2022-10-06 18:47:32 +02:00
Cayo Puigdefabregas 722ee1a261 fix phid definition 2022-10-05 12:22:40 +02:00
Cayo Puigdefabregas 02f394d81e add id_internal in placeholder model 2022-10-05 09:17:27 +02:00
Cayo Puigdefabregas 6357a15f01 fix migrations 2022-09-30 17:54:26 +02:00
Cayo Puigdefabregas 60992a13da change 100 for None 2022-09-28 11:55:31 +02:00
Cayo Puigdefabregas ab06bd5f44 fix remain_lifetime_percentage 2022-09-28 11:10:34 +02:00
Cayo Puigdefabregas a0c938c044 get the phid of the computer from where created 2022-09-26 17:22:01 +02:00
Cayo Puigdefabregas 194fe366fd fix bug 3841 2022-09-26 08:14:04 +02:00
Cayo Puigdefabregas a9947fd93f changes order of columns in export devices 2022-09-21 13:04:57 +02:00
Cayo Puigdefabregas c3aa1edd5a get the last update of one device 2022-09-20 17:25:09 +02:00
Cayo Puigdefabregas 4d3ab6a70c fix phid 2022-09-20 13:31:21 +02:00
Cayo Puigdefabregas 1ec0f83d28 add erasure total counts 2022-09-19 14:04:30 +02:00
Cayo Puigdefabregas b118edb0a9 erasure only one time for row and disk 2022-09-19 12:10:34 +02:00
Cayo Puigdefabregas b597fdd372 add new colums in report 2022-09-19 11:58:56 +02:00
Cayo Puigdefabregas a1febe8b3f modify abstract for snapshot and real for placeholder 2022-09-15 11:51:27 +02:00
Cayo Puigdefabregas d215008927 add part number 2022-09-13 18:15:50 +02:00
Cayo Puigdefabregas ec844a7376 fixing bigs of excel with phid with nan 2022-09-08 14:04:49 +02:00
Cayo Puigdefabregas 5913733404 fix tests 2022-09-07 16:23:31 +02:00
Cayo Puigdefabregas f19046b2ef add backups for the abstract phid and dhid 2022-09-07 14:04:09 +02:00
Cayo Puigdefabregas 74c8a48d6e get erasure datas form abstract device and drop parent details 2022-09-02 16:40:35 +02:00
Cayo Puigdefabregas 74a8472aa1 fix 11 test 2022-09-02 12:42:26 +02:00
Cayo Puigdefabregas 60f7ee8354 use dhid for get the devicehub_id of the real parth of a device 2022-08-31 17:27:17 +02:00
Cayo Puigdefabregas c0653e51ce redirect public link from abstract to real device 2022-08-31 10:55:49 +02:00
Cayo Puigdefabregas 30f511a03a add both device in a public page when is a twin device 2022-08-29 16:36:57 +02:00
Cayo Puigdefabregas 05d1f9698c add both device in a public page when is a twin device 2022-08-29 16:36:42 +02:00
Cayo Puigdefabregas 138dc66b9a modify details page and binding/unbinding page 2022-08-11 14:50:47 +02:00
Cayo Puigdefabregas 57ba86eb39 add actions in placeholder model 2022-08-11 10:21:45 +02:00
Cayo Puigdefabregas f55abc4a7b put the old dhid in the new placeholder device 2022-08-10 18:05:18 +02:00
Cayo Puigdefabregas 6687898784 add placeholder datas 2022-08-09 17:52:18 +02:00
Cayo Puigdefabregas c55dbc3c8c create a Base device row 2022-08-09 17:13:29 +02:00
Cayo Puigdefabregas f63192c833 create a Base device row 2022-08-09 17:09:58 +02:00
Cayo Puigdefabregas 8c4f7eb10e add components placeholder and simplify binding process 2022-08-09 10:49:56 +02:00
Cayo Puigdefabregas 1996e8fa7a new concept of status abstract of a device 2022-08-05 16:42:07 +02:00
Cayo Puigdefabregas 080fc039ec drop cascade own 2022-08-02 13:14:02 +02:00
Cayo Puigdefabregas 72b34b3330 resolve conflict 2022-08-02 12:58:26 +02:00
Cayo Puigdefabregas 9c2d52a7f7 fix cascade delete in placeholder 2022-08-02 12:41:31 +02:00
Cayo Puigdefabregas 5ba879d4b5 other type of quotes 2022-08-01 19:17:21 +02:00
Cayo Puigdefabregas 2a9b6864be resolve conflict 2022-08-01 17:23:27 +02:00
Cayo Puigdefabregas c6bbaa0460 add quotation for results of csv 2022-08-01 16:13:55 +02:00
Cayo Puigdefabregas 063d20695f add quotation for results of csv 2022-07-29 18:30:58 +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 b0beff5b1d commit validation imei for mobiles 2022-07-28 18:12:49 +02:00
Cayo Puigdefabregas 497e29a2da add manual binding 2022-07-28 17:48:14 +02:00
Cayo Puigdefabregas d008bb2921 resolve conflicts 2022-07-25 18:16:09 +02:00
Cayo Puigdefabregas 8bec1fbd29 Merge branch 'change/3659-weekly-report' into testing 2022-07-25 16:03:08 +02:00
Cayo Puigdefabregas a74e242e20 add report command cli 2022-07-22 15:23:49 +02:00
Cayo Puigdefabregas d0bfb9644d add phid and tags in labels 2022-07-21 13:56:09 +02:00
Cayo Puigdefabregas 5d9928bd70 fixed tests 2022-07-20 14:58:32 +02:00
Cayo Puigdefabregas 7db53a5779 fix delete device 2022-07-20 12:39:21 +02:00
Cayo Puigdefabregas 924d9941bc resolve conflict 2022-07-20 12:28:08 +02:00
Cayo Puigdefabregas 02404c4277 fix export placeholders 2022-07-20 11:19:45 +02:00
Cayo Puigdefabregas 2aafe9efcc remove add tag automaticaly 2022-07-20 10:33:44 +02:00
Cayo Puigdefabregas a2b9d1c96d drop filter only by wb device 2022-07-20 10:03:46 +02:00
Cayo Puigdefabregas 31abdf55e2 show only devices wb via api 2022-07-18 17:56:54 +02:00
Cayo Puigdefabregas e3a7684865 sync only wb devices 2022-07-18 16:56:35 +02:00
Cayo Puigdefabregas 9e42ccafc0 change device for placeholders in lots 2022-07-15 18:07:39 +02:00
Cayo Puigdefabregas 1fa6e7512c fix tag automatic only for placeholder 2022-07-15 13:11:04 +02:00
Cayo Puigdefabregas 2c6f831068 add a placeholder when arrive a snapshot 2022-07-13 11:23:18 +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 99238d69d8 resolve conflict 2022-07-11 09:35:03 +02:00
Cayo Puigdefabregas fa45080a44 fixed 2022-07-08 12:21:07 +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 16daba1fa5 add placeholder in sync function 2022-06-28 17:40:00 +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 18e051596c fixing system uuid as non physical property 2022-06-24 11:27:42 +02:00
Cayo Puigdefabregas 8bcbf21abe resolve conflicts 2022-06-23 17:08:07 +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 cf4e1df527 add field type of transfer instead of change the name 2022-06-21 17:50:27 +02:00
Cayo Puigdefabregas 7d40f5b537 add transfer in name of lot 2022-06-21 16:40:21 +02:00
Cayo Puigdefabregas 2a3b7a0900 add Transfers to lot dropdown 2022-06-21 08:11:42 +02:00
Cayo Puigdefabregas 49062d9944 add export devices lots 2022-06-20 10:40:00 +02:00
Cayo Puigdefabregas 559e926626 fix commit in db 2022-06-17 11:24:52 +02:00
Cayo Puigdefabregas 88a164a9ee save system uuid only for smbios >= 2.6 2022-06-16 17:58:32 +02:00
Cayo Puigdefabregas 34def901cb change uuid in views and forms for system_uuid 2022-06-15 12:18:44 +02:00
Cayo Puigdefabregas 0f916e5964 change uuid for system_uuid 2022-06-15 12:17:16 +02:00
Cayo Puigdefabregas 86446a268c fix uuid in device not computer 2022-06-14 10:46:21 +02:00
Cayo Puigdefabregas 660e238468 fix order of vars declared 2022-06-13 17:59:54 +02:00
Cayo Puigdefabregas e1cdd56fa0 add uuid for old register api 2022-06-13 17:35:01 +02:00
Cayo Puigdefabregas 686d0a9307 add system_uuid to sync run function 2022-06-13 17:33:22 +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 ad7848edc6 add snapshotLog in old api 2022-06-03 11:06:49 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
Cayo Puigdefabregas 7e4bdfdc69 create transfer in angular version for code trades 2022-06-01 10:29:55 +02:00
Cayo Puigdefabregas 01f2996c48 fixed query lots 2022-05-31 15:14:56 +02:00
Cayo Puigdefabregas b8819b7a4a change is_temporary, is_outgoing, is_incoming 2022-05-27 16:48:40 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
Cayo Puigdefabregas a486486995 fix circular imports 2022-05-20 18:30:43 +02:00
Cayo Puigdefabregas 6bf419f59a try to fix bug 2022-05-20 11:45:53 +02:00
Cayo Puigdefabregas bf455c40c9 try to fix bug 2022-05-20 11:42:39 +02:00
Cayo Puigdefabregas cea143dcbe fix lot render 2022-05-19 10:58:07 +02:00
Cayo Puigdefabregas f2a7a15851 drop pdbs 2022-05-18 18:25:21 +02:00
Cayo Puigdefabregas a7ceab2cde change SnapshotErrors for SnapshotsLog 2022-05-18 11:03:58 +02:00
Cayo Puigdefabregas 68fc1cb2bb resolv conflicts 2022-05-16 18:23:03 +02:00
Cayo Puigdefabregas b309cc4410 change Mixin clases 2022-05-16 17:52:31 +02:00
Cayo Puigdefabregas 0b78178ff4 fixed device public page 2022-05-16 10:29:07 +02:00
Cayo Puigdefabregas dd081532ba #3402 change public page of device 2022-05-13 17:17:57 +02:00
Cayo Puigdefabregas df44849ad3 add allocate status in devices export 2022-05-13 12:51:31 +02:00
Cayo Puigdefabregas 1b5f6412f0 #3397 add columns of status in the devices list 2022-05-13 12:17:14 +02:00
Cayo Puigdefabregas 1d51629796 resolve conflict 2022-05-09 16:35:44 +02:00
Santiago L 7177b0fbfd
Merge pull request #233 from RubenPX/filter-in-out-trades
Filter in out trades from lots selector
2022-05-06 07:58:11 +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