Commit graph

492 commits

Author SHA1 Message Date
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 21d251e6c0 add reopen transfer 2023-03-13 17:52:00 +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 20ccb385d8 add lots in list of erasures actions 2023-03-09 18:38:54 +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 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 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 26ed0f3577 details device 2023-02-24 17:01:38 +01:00
Cayo Puigdefabregas 26f8d191fb . 2023-02-23 17:07:00 +01:00
nad 5bdcf4da7f disable WB_BENCHMARK in wb settings 2023-02-23 12:52:27 +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 2553a9cdd0 fix footer 2023-02-02 10:58:37 +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 9db949cef2 add correct descriptions in the pop ups 2023-01-18 12:38:08 +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 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
Cayo Puigdefabregas 7789d972eb fix simple-datatables librarie 2023-01-11 18:32:02 +01:00
Cayo Puigdefabregas 62de2126c7 base of form for update type of updated 2022-12-22 12:01:31 +01:00
Cayo Puigdefabregas 1924d7fe71 wb settins 2022-12-15 10:20:17 +01:00
Cayo Puigdefabregas 534adbba75 Merge branch 'master' into testing 2022-12-05 10:35:49 +01:00
Cayo Puigdefabregas 9a39f3ae9d fix bug 2022-12-05 10:05:12 +01:00
Cayo Puigdefabregas a2626a0b58 add settings version to version column in snapshots log 2022-11-30 16:46:10 +01:00
Cayo Puigdefabregas 4fa6f9f343 Merge branch 'testing' into feature/3999-setings 2022-11-30 16:13:33 +01:00
Cayo Puigdefabregas e36f813d92 put prefix in lots in result of search 2022-11-30 13:28:17 +01:00
Cayo Puigdefabregas 18281c95e5 remove system_uuid 2022-11-30 12:10:00 +01:00
Cayo Puigdefabregas 3f5ae9fefd change settings template 2022-11-30 11:55:32 +01:00
Cayo Puigdefabregas 785f72692a change settings template 2022-11-30 11:53:19 +01:00
cayop 4dff032fe6
Merge pull request #411 from eReuse/feature/4094-add-new-fields
Feature/4094 add new fields
2022-11-29 18:11:55 +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