Commit Graph

1094 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 48be3bae64 fix teal import inm did resource 2023-05-24 10:25:04 +02:00
Cayo Puigdefabregas 4e610f0903 resolve conflict 2023-05-23 15:28:13 +02:00
Cayo Puigdefabregas 39b04f3709 new datawipe 2023-05-23 13:45:32 +02:00
Cayo Puigdefabregas b5a77ace2f add logout 2023-05-19 18:17:22 +02:00
Cayo Puigdefabregas 7b2bfd095c adapt client oidc 2023-05-19 17:05:02 +02:00
Cayo Puigdefabregas 3cf87f7f95 add vars and get_user_id in model user 2023-05-12 12:05:41 +02:00
Cayo Puigdefabregas ebdb6949c9 Merge branch 'master' into testing 2023-05-10 17:01:59 +02:00
Cayo Puigdefabregas 8e54f34519 fix set_hid 2023-05-07 19:43:30 +02:00
cayop 8ba853b14a
Merge pull request #447 from eReuse/feature/4343-share-lot
Feature/4343 share lot
2023-04-28 15:10:29 +02:00
Cayo Puigdefabregas 0547e4cf32 allow get device for export when is a share lot 2023-04-28 12:10:25 +02:00
Cayo Puigdefabregas e365c366f4 share lot structure 2023-04-26 18:25:03 +02:00
Cayo Puigdefabregas e649d65b5d add validations in public page of device 2023-04-26 12:24:38 +02:00
cayop 9da841fc1f
Merge pull request #446 from eReuse/changes/4217-add-columns-export-devices
Bugfix/4217 fix id supplier column in export devices
2023-04-21 17:17:42 +02:00
Cayo Puigdefabregas 750d3e7db6 fix id supplier in export devices 2023-04-21 12:47:53 +02:00
Cayo Puigdefabregas ae5992f4c0 Merge branch 'testing' into without-teal 2023-04-17 11:51:44 +02:00
Cayo Puigdefabregas 645bdf3750 new device document 2023-03-31 18:06:22 +02:00
Cayo Puigdefabregas 3a08347276 Merge branch 'without-teal' of github.com:eReuse/devicehub-teal into without-teal 2023-03-30 12:49:15 +02:00
Cayo Puigdefabregas 1515302d98 allow remove a document 2023-03-28 17:09:47 +02:00
Cayo Puigdefabregas 745b9966df add lots in export devices 2023-03-27 16:34:25 +02:00
Cayo Puigdefabregas 83f1e4c18f add ereuse_utils as module 2023-03-21 17:31:43 +01:00
Cayo Puigdefabregas 01ef359bd4 add teal as module 2023-03-21 12:08:13 +01:00
Cayo Puigdefabregas 6a14727f31 fix names of titles 2023-03-20 17:34:20 +01:00
Cayo Puigdefabregas a7aae591aa fix names of titles 2023-03-20 17:32:58 +01:00
Cayo Puigdefabregas 7dc7ca2026 Merge branch 'testing' into new-trublo 2023-03-15 17:57:16 +01:00
Cayo Puigdefabregas 174928872f resolve conflict 2023-03-15 15:49:35 +01:00
Cayo Puigdefabregas 6fa5a25a4a Merge branch 'testing' 2023-03-14 17:16:24 +01:00
Cayo Puigdefabregas d1abc8075f fix 2023-03-14 12:50:57 +01:00
Cayo Puigdefabregas d0688cc751 fix with last lot incoming 2023-03-13 12:24:57 +01:00
Cayo Puigdefabregas ba02351f59 fix lots 2023-03-10 20:13:54 +01:00
Cayo Puigdefabregas 1c82fcfa30 add customer details for default if there are more than one incoming lot 2023-03-10 18:34:09 +01:00
Cayo Puigdefabregas 20ccb385d8 add lots in list of erasures actions 2023-03-09 18:38:54 +01:00
Cayo Puigdefabregas 7534df083c fix definition of model SanitizationEntity 2023-03-07 16:40:45 +01:00
Cayo Puigdefabregas 8f58bcb24e fix type 2023-03-07 10:20:25 +01:00
Cayo Puigdefabregas 327e5f20cb merge testing 2023-03-03 17:45:41 +01:00
Cayo Puigdefabregas 2da17d06c0 fix dpp template in new version 2023-03-03 12:11:11 +01:00
Cayo Puigdefabregas b6b5e5d29d fix fields string 2023-03-01 18:06:41 +01:00
Cayo Puigdefabregas 12b196fd8e fix register dpp 2023-03-01 12:49:30 +01:00
Cayo Puigdefabregas 6b9965f57e drop pdbs 2023-02-28 17:25:20 +01:00
Cayo Puigdefabregas e900f5f298 erasure on server 2023-02-28 16:43:28 +01:00
Cayo Puigdefabregas fb413671fc fix size of ram and data storage 2023-02-25 11:29:41 +01:00
Cayo Puigdefabregas ef8825568f add proof 2023-02-20 19:16:43 +01:00
Cayo Puigdefabregas 599f15d5ae fixed proof register 2023-02-20 11:37:19 +01:00
Cayo Puigdefabregas 1907f2508a fix proof 2023-02-17 17:26:38 +01:00
Cayo Puigdefabregas 8207ca9ab2 save datas and initialized form 2023-02-14 12:15:21 +01:00
Cayo Puigdefabregas 8cd7777fc6 add model, form and template of sanitization entity 2023-02-13 20:35:31 +01:00
Cayo Puigdefabregas 77c8e2181f only sync DataStorages 2023-02-10 20:09:22 +01:00
Cayo Puigdefabregas 184a9877bc fix footer 2023-02-02 11:02:36 +01:00
Cayo Puigdefabregas 2553a9cdd0 fix footer 2023-02-02 10:58:37 +01:00
Cayo Puigdefabregas 799c003a09 fix 2023-02-01 17:29:43 +01:00
Cayo Puigdefabregas 7a8cbe11a6 fix 2023-02-01 17:25:39 +01:00
cayop bea63148b2
Merge pull request #426 from eReuse/feature/2078-public-page
add new version of public page
2023-02-01 17:16:12 +01:00
Cayo Puigdefabregas 7dc3ac9530 fix test 2023-02-01 16:35:27 +01:00
Cayo Puigdefabregas 6b5db31922 add new version of public page 2023-02-01 13:28:31 +01:00
Cayo Puigdefabregas 6c9334fa76 fix test 2 2023-01-26 11:35:08 +01:00
Cayo Puigdefabregas de9b525737 . 2023-01-26 10:46:34 +01:00
Cayo Puigdefabregas 32dc4445e4 fix some things of interaction with the api and register dpps 2023-01-25 13:20:43 +01:00
Cayo Puigdefabregas e7e595f2c2 add json_wb in snapshot 2023-01-23 19:44:36 +01:00
Cayo Puigdefabregas 45a787aa39 . 2023-01-23 11:52:38 +01:00
Cayo Puigdefabregas 574ab36da4 add registar issuer passport 2023-01-20 18:58:25 +01:00
Cayo Puigdefabregas fbe8600cc1 resolve conflicts 2023-01-19 13:42:01 +01:00
Cayo Puigdefabregas 9053c89f47 add chid_dpp and phid_dpp in models 2023-01-19 13:33:32 +01:00
Cayo Puigdefabregas 8ed1e2296d Merge branch 'testing' into new-trublo 2023-01-19 12:26:29 +01:00
Cayo Puigdefabregas 8dd926de80 add dpp 2023-01-19 12:26:25 +01:00
Cayo Puigdefabregas faa7c1d605 . 2023-01-18 18:56:04 +01:00
Cayo Puigdefabregas 6fc802e159 fix test reliable 2023-01-16 15:26:58 +01:00
Cayo Puigdefabregas 520f1726be reliable device 2023-01-13 17:42:42 +01:00
Cayo Puigdefabregas ac4e87d2b3 Merge branch 'testing' into changes/4025-new-hid 2023-01-11 17:18:52 +01:00
Cayo Puigdefabregas bc12258db0 create device 2023-01-11 17:17:50 +01:00
cayop b77c81c16a
Merge pull request #421 from eReuse/bugfix/4206-donalo-incoming
Bugfix/4206 donalo incoming
2023-01-11 10:49:20 +01:00
Cayo Puigdefabregas a265af8864 fix remove placeholder from trade 2023-01-11 10:18:22 +01:00
Cayo Puigdefabregas 9603ac1f43 . 2023-01-11 09:38:39 +01:00
Cayo Puigdefabregas 50856671ed reliable and unreliable device. Active and deactive devices and snapshots 2022-12-23 18:33:49 +01:00
Cayo Puigdefabregas 14ce3892ac add new filter in actions for show only active snapshots 2022-12-22 18:39:59 +01:00
Cayo Puigdefabregas bf5c3d6abc add snapshot.active in model and migration file 2022-12-22 18:04:34 +01:00
Cayo Puigdefabregas 62de2126c7 base of form for update type of updated 2022-12-22 12:01:31 +01:00
Cayo Puigdefabregas 2bb6b13e07 fix 2022-12-20 11:06:41 +01:00
Cayo Puigdefabregas 31b62a2d81 check if is active module hid 2022-12-20 10:17:42 +01:00
Cayo Puigdefabregas 84e937026e fix tests 2022-12-19 20:03:34 +01:00
Cayo Puigdefabregas c066d8a2af fix tests 2022-12-14 16:57:59 +01:00
Cayo Puigdefabregas 2cc677a555 fix sync 2022-12-14 11:42:11 +01:00
Cayo Puigdefabregas fc36218124 fix set_chid 2022-12-13 20:41:15 +01:00
Cayo Puigdefabregas 1b11162522 clean sync class 2022-12-13 20:40:28 +01:00
Cayo Puigdefabregas da1feef746 fix migration 2022-12-13 14:29:52 +01:00
Cayo Puigdefabregas 27910f2c20 clean 2022-12-13 14:25:44 +01:00
Cayo Puigdefabregas 756925d657 migrations and get_from_db 2022-12-13 14:02:38 +01:00
Cayo Puigdefabregas fac6380bcf . 2022-12-12 14:10:17 +01:00
Cayo Puigdefabregas 5e8cf78751 put the forze of validation in the schemas 2022-12-05 19:17:54 +01:00
Cayo Puigdefabregas d6bee33601 fix new hid in build 2022-12-05 17:33:22 +01:00
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