Commit graph

246 commits

Author SHA1 Message Date
Cayo Puigdefabregas 47e918dc07 Merge branch 'testing' into dpp 2023-06-14 10:45:42 +02:00
Cayo Puigdefabregas 7638a6dab4 not datawipe for placeholders computers 2023-06-14 10:17:01 +02:00
Cayo Puigdefabregas 80486136bd Merge branch 'testing' into dpp 2023-06-13 12:32:08 +02:00
Cayo Puigdefabregas 314e944208 fix bug 2023-06-13 11:07:24 +02:00
Cayo Puigdefabregas 57882ca2c5 add placeholder datastorage 2023-06-12 18:47:55 +02:00
Cayo Puigdefabregas 2543f7f761 add datastorage placeholders 2023-06-09 18:17:06 +02:00
Cayo Puigdefabregas f7a60647b9 resolve conflict 2023-06-08 11:44:08 +02:00
Cayo Puigdefabregas 2c171d8e26 remove validation of imei 2023-06-07 12:28:00 +02:00
Cayo Puigdefabregas efacba6aab Merge branch 'testing' into new-trublo 2023-05-30 16:34:12 +02:00
Cayo Puigdefabregas 631bfa2774 change certificate pdf 2023-05-26 17:11:47 +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
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 750d3e7db6 fix id supplier in export devices 2023-04-21 12:47:53 +02:00
Cayo Puigdefabregas 1a7c2f3a01 fix required in form 2023-04-19 16:17:29 +02:00
Cayo Puigdefabregas 0ce12bbfba fix it 2023-04-18 18:15: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 509a445480 add edit document form 2023-03-29 13:40:27 +02:00
Cayo Puigdefabregas 1515302d98 allow remove a document 2023-03-28 17:09:47 +02:00
Cayo Puigdefabregas 174928872f resolve conflict 2023-03-15 15:49:35 +01:00
Cayo Puigdefabregas b140dc5f89 fix without logo 2023-03-13 17:04:57 +01:00
Cayo Puigdefabregas 6d722bb19f feedback when there are one error in sanitization form 2023-03-09 18:07:16 +01:00
Cayo Puigdefabregas de24cae235 add placeholder 2023-03-09 10:43:35 +01:00
Cayo Puigdefabregas 327e5f20cb merge testing 2023-03-03 17:45:41 +01:00
Cayo Puigdefabregas 12d64aefdc save customer datas in transfers 2023-02-14 20:03:33 +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 e7e595f2c2 add json_wb in snapshot 2023-01-23 19:44:36 +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 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 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
Cayo Puigdefabregas 62de2126c7 base of form for update type of updated 2022-12-22 12:01:31 +01:00
Cayo Puigdefabregas 84e937026e fix tests 2022-12-19 20:03:34 +01:00
Cayo Puigdefabregas d6bee33601 fix new hid in build 2022-12-05 17:33:22 +01:00
Cayo Puigdefabregas 39f19f676b Merge branch 'testing' into changes/4025-new-hid 2022-12-01 15:59:52 +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 ac535cc9b5 add new fields in the filters 2022-11-22 15:44:44 +01:00
Cayo Puigdefabregas 67cf797c6c fixing name hardDrive in filter 2022-11-22 11:58:56 +01:00
Cayo Puigdefabregas 236fcac0b8 add new hid in devices 2022-11-16 11:51:31 +01:00
Cayo Puigdefabregas 563e2ec652 Merge branch 'master' into testing 2022-10-26 10:03:07 +02:00
Cayo Puigdefabregas e30990cc1b fix render image None 2022-10-26 09:33:28 +02:00
Cayo Puigdefabregas 2a8da254d9 fix image in edit device 2022-10-25 17:54:58 +02:00
Cayo Puigdefabregas 4c2f37dfec resolve conflict 2022-10-24 18:33:40 +02:00