Commit graph

399 commits

Author SHA1 Message Date
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 327e5f20cb merge testing 2023-03-03 17:45:41 +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 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 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 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
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 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 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