Commit Graph

2216 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 02752ee2b8 hide submit in filter of list of devices 2023-05-04 12:58:32 +02:00
cayop b8593bd63f
Merge pull request #448 from eReuse/feature/4343-share-lot
Feature/4343 share lot
2023-05-04 10:59:29 +02:00
Cayo Puigdefabregas 7b9c33ca4f fix base template 2023-05-04 10:27:40 +02:00
Cayo Puigdefabregas 9cafc4f72b shared and customer details in exports lots 2023-05-04 10:23:56 +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 4e5dbe8cd1 fix tests 2023-04-28 14:45:22 +02:00
Cayo Puigdefabregas c9f996dd8e fix schema in sql query 2023-04-28 12:54:30 +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 f9ed33d46d Merge branch 'testing' into without-teal 2023-04-20 17:59:17 +02:00
Cayo Puigdefabregas 119b4938c0 upgrade version 2023-04-20 10:52:19 +02:00
Cayo Puigdefabregas e224f22b85 Merge branch 'testing' into without-teal 2023-04-20 09:18:17 +02:00
Cayo Puigdefabregas 1a7c2f3a01 fix required in form 2023-04-19 16:17:29 +02:00
Cayo Puigdefabregas ce7693dd9b fix import teal in migration 2023-04-19 11:30:12 +02:00
Cayo Puigdefabregas dcae036271 Merge branch 'testing' into without-teal 2023-04-19 11:26:53 +02:00
Cayo Puigdefabregas 0ce12bbfba fix it 2023-04-18 18:15:44 +02:00
Cayo Puigdefabregas 6692233a22 fix 2023-04-18 11:08:43 +02:00
Cayo Puigdefabregas b6b8c6a1f9 add new columns 2023-04-18 10:10:43 +02:00
Cayo Puigdefabregas ae5992f4c0 Merge branch 'testing' into without-teal 2023-04-17 11:51:44 +02:00
Cayo Puigdefabregas cd4d1bb095 add select field 2023-04-04 17:23:50 +02:00
Cayo Puigdefabregas 2f27095c84 documents in devices 2023-04-04 16:56:27 +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 509a445480 add edit document form 2023-03-29 13:40:27 +02:00
Cayo Puigdefabregas d1c332e891 add edit document in template 2023-03-29 10:43:30 +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 e6c07851d4 fix lint checks 2023-03-27 10:55:26 +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 e624ab7a7a Merge branch 'testing' of github.com:eReuse/devicehub-teal into testing 2023-03-20 18:08:48 +01:00
Cayo Puigdefabregas 2ff6f40228 fix links 2023-03-20 18:08:37 +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 ad52bad3f6 up version to 2.5.1 2023-03-17 11:35:35 +01:00
Cayo Puigdefabregas ad1e5e06d9 proofs in details 2023-03-16 10:35:37 +01:00
Cayo Puigdefabregas 7dc7ca2026 Merge branch 'testing' into new-trublo 2023-03-15 17:57:16 +01:00
Cayo Puigdefabregas c94801deab Merge branch 'master' into bugfix/doc-erasure-fix-hid 2023-03-15 17:23:46 +01:00
Cayo Puigdefabregas a27dc0914c fix hide hid of erasure certificate 2023-03-15 17:19:31 +01:00
Cayo Puigdefabregas e559ea30da add proof in document 2023-03-15 16:40:29 +01:00
Cayo Puigdefabregas 174928872f resolve conflict 2023-03-15 15:49:35 +01:00
Cayo Puigdefabregas ddcd1697e6 fix template 2023-03-14 17:52:49 +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 21d251e6c0 add reopen transfer 2023-03-13 17:52:00 +01:00
Cayo Puigdefabregas b140dc5f89 fix without logo 2023-03-13 17:04:57 +01:00
Cayo Puigdefabregas d0688cc751 fix with last lot incoming 2023-03-13 12:24:57 +01:00
Cayo Puigdefabregas 498d2ec92f fix test 2023-03-10 21:56:17 +01:00
Cayo Puigdefabregas cf5150b7c9 fix lots 2023-03-10 21:15:00 +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 6d722bb19f feedback when there are one error in sanitization form 2023-03-09 18:07:16 +01:00
Cayo Puigdefabregas 93d6502a66 fix server report n_computers 2023-03-09 13:09:05 +01:00
Cayo Puigdefabregas 6b0110adda fix server report 2023-03-09 12:40:46 +01:00
Cayo Puigdefabregas de24cae235 add placeholder 2023-03-09 10:43:35 +01:00
Cayo Puigdefabregas 40a151df5a fix order of devices 2023-03-08 17:22:26 +01:00
Cayo Puigdefabregas 54372ad2f9 put comment as placeholder in field of logo 2023-03-08 12:43:37 +01:00
Cayo Puigdefabregas eb945ae348 fix ortigraphy 2023-03-08 12:34:52 +01:00
Cayo Puigdefabregas ab6f89c3d2 fix sanitization_entity in view 2023-03-08 10:58:28 +01:00
Cayo Puigdefabregas eed1075771 save with commit for default 2023-03-07 16:41:24 +01:00
Cayo Puigdefabregas 7534df083c fix definition of model SanitizationEntity 2023-03-07 16:40:45 +01:00
Cayo Puigdefabregas 0ff2bcae92 use populate_obj 2023-03-07 16:39:52 +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 1e62af56a6 fix parent 2023-03-03 16:00:54 +01:00
Cayo Puigdefabregas 2da17d06c0 fix dpp template in new version 2023-03-03 12:11:11 +01:00
Cayo Puigdefabregas 5bfd69f785 fix customer name in pdf 2023-03-03 10:11:18 +01:00
Cayo Puigdefabregas c8fb5db63c add dpp in device details 2023-03-02 10:35:37 +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 be271d59ea fix test render 2023-02-28 17:25:42 +01:00
Cayo Puigdefabregas 6b9965f57e drop pdbs 2023-02-28 17:25:20 +01:00
Cayo Puigdefabregas 7f6acf2db8 drop simple-datatables from local 2023-02-28 16:56:00 +01:00
Cayo Puigdefabregas e900f5f298 erasure on server 2023-02-28 16:43:28 +01:00
Cayo Puigdefabregas 69cb07d55a Merge branch 'testing' into features/4251-delete-certificate 2023-02-27 10:08:47 +01:00
Cayo Puigdefabregas fb413671fc fix size of ram and data storage 2023-02-25 11:29:41 +01:00
Cayo Puigdefabregas 26ed0f3577 details device 2023-02-24 17:01:38 +01:00
Cayo Puigdefabregas c9d23d5e6a benchamark to False in wbSettings template 2023-02-23 17:14:21 +01:00
Cayo Puigdefabregas 5f9abe83d6 change version of usody iso to 14.2.0 2023-02-23 17:13:16 +01:00
Cayo Puigdefabregas 26f8d191fb . 2023-02-23 17:07:00 +01:00
nad c24460009e update wb iso to 14.2.0 2023-02-23 12:52:57 +01:00
nad 5bdcf4da7f disable WB_BENCHMARK in wb settings 2023-02-23 12:52:27 +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 80013bcc90 . 2023-02-17 10:45:55 +01:00
Cayo Puigdefabregas 680a7b89e2 change base of template 2023-02-15 18:30:45 +01:00
Cayo Puigdefabregas 12d64aefdc save customer datas in transfers 2023-02-14 20:03:33 +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 8efccf4f58 fix migrations order 2023-02-09 11:48:50 +01:00
Cayo Puigdefabregas 6b54521d50 fix versions 2023-02-08 12:54:38 +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 4055365bc9 fix dummy 2023-02-02 10:58:09 +01:00
Stephan Fortelny bed2c534b5 Updated links to Terms & Conditions and Privacy Policy now hosted in English on usody.com 2023-02-02 08:01:53 +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
cayop cbf2d607a1
Merge pull request #425 from eReuse/feature/4245
Feature/4245
2023-01-31 13:12:35 +01:00
Cayo Puigdefabregas 00c07161e0 add link to price 2023-01-31 12:38:47 +01:00
Nadeu 38b77c111a
Update 14.1.0 iso 2023-01-27 12:04:54 +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
Nadeu 253371376d
Update HWMD iso to 2022.12.2-beta 2023-01-19 11:27:53 +01:00
Nadeu 850278c297
Update HWMD iso to 2022.12.2-beta 2023-01-19 10:27:01 +01:00
Cayo Puigdefabregas faa7c1d605 . 2023-01-18 18:56:04 +01:00
Cayo Puigdefabregas 9db949cef2 add correct descriptions in the pop ups 2023-01-18 12:38:08 +01:00
Cayo Puigdefabregas c26d2d69b9 fix filter active TRue 2023-01-17 13:18:18 +01:00
Cayo Puigdefabregas f8d418b4a9 add pop up 2023-01-17 13:07:01 +01:00
Cayo Puigdefabregas a572ef0507 add pop up 2023-01-17 13:00:34 +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 5e7d95ba31 Merge branch 'testing' into changes/4025-new-hid 2023-01-11 22:14:32 +01:00
cayop 12aa5e917d
Merge pull request #422 from eReuse/bugfix/simple-datatables
Bugfix/simple datatables
2023-01-11 18:53:10 +01:00
Lint Action 00310a3228 Fix code style issues with ESLint 2023-01-11 17:34:54 +00:00
Cayo Puigdefabregas 7789d972eb fix simple-datatables librarie 2023-01-11 18:32:02 +01:00
Cayo Puigdefabregas 23f4a0e412 fix simple-datatables librarie 2023-01-11 18:31:11 +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 f929283f4f fix trades in temporary list 2023-01-10 14:11:42 +01:00
Cayo Puigdefabregas 350aad19c4 get all lots not only temporary 2023-01-10 14:10:49 +01:00
Cayo Puigdefabregas 9c2bc7d7fa put the correct link in the snapshot to warning message 2023-01-10 10:49:32 +01:00
Cayo Puigdefabregas 50856671ed reliable and unreliable device. Active and deactive devices and snapshots 2022-12-23 18:33:49 +01:00
Nadeu 8a8feb3165
Update iso 2022.12.1-beta 2022-12-23 13:53:22 +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 b3b4e8cd2b Merge branch 'testing' into changes/4025-new-hid 2022-12-15 16:17:09 +01:00