Commit Graph

2233 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 57caf52c02 fix initial id 2023-06-16 11:55:21 +02:00
Cayo Puigdefabregas 52da9c99ba commands 2023-06-16 09:31:16 +02:00
Cayo Puigdefabregas 7ddcb8ead0 resolve conflict 2023-06-15 18:32:49 +02:00
Cayo Puigdefabregas 523ca3e892 add some modules commands 2023-06-15 18:30:55 +02:00
Cayo Puigdefabregas 5f1c7c8b4a add command adduser 2023-06-15 17:56:34 +02:00
Cayo Puigdefabregas fad008b25d command initdatas 2023-06-15 16:41:47 +02:00
Cayo Puigdefabregas 17c88ef4b1 get rols 2023-06-15 10:43:43 +02:00
Cayo Puigdefabregas 3c23c8ce09 add rols to user 2023-06-14 16:06:10 +02:00
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 c27040296d up version 2023-06-13 17:14:39 +02:00
Cayo Puigdefabregas 1bdf0c8baa change format erase datawipe 2023-06-13 16:48:52 +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 dc07b4973b add datastorage to csv 2023-06-13 08:53:17 +02:00
Cayo Puigdefabregas 57882ca2c5 add placeholder datastorage 2023-06-12 18:47:55 +02:00
Cayo Puigdefabregas 6aa643c197 mobile datawipe in csv report and pdf certificate 2023-06-12 17:38:32 +02:00
Cayo Puigdefabregas 2543f7f761 add datastorage placeholders 2023-06-09 18:17:06 +02:00
Cayo Puigdefabregas 850398f7ed add id federated to actions 2023-06-08 19:04:55 +02:00
Cayo Puigdefabregas f7a60647b9 resolve conflict 2023-06-08 11:44:08 +02:00
cayop a38c990412
Merge pull request #454 from eReuse/bugfix/4350-edit-imei
Bugfix/4350 edit imei
2023-06-07 16:26:18 +02:00
Cayo Puigdefabregas bb6365c519 fix tests smartphons 2023-06-07 13:36:08 +02:00
Cayo Puigdefabregas 2ef6e6cb49 remove validate of imei 2023-06-07 12:50:21 +02:00
Cayo Puigdefabregas 2c171d8e26 remove validation of imei 2023-06-07 12:28:00 +02:00
Cayo Puigdefabregas 4d5761ac02 fix config get 2023-06-06 17:42:15 +02:00
Cayo Puigdefabregas 66e162db4d add services in register a new device 2023-06-06 16:47:47 +02:00
Cayo Puigdefabregas 79c2ecbd81 add ID_FEDERATED 2023-06-05 17:11:28 +02:00
Cayo Puigdefabregas b29086e46d fix 2023-06-05 16:03:35 +02:00
Cayo Puigdefabregas 9119143a63 fix 2023-06-05 16:00:10 +02:00
Cayo Puigdefabregas 9671333635 fix layout and drop rols for public page of device 2023-06-02 18:24:07 +02:00
Cayo Puigdefabregas e3b8543a12 fix rols 2023-06-02 18:05:03 +02:00
Cayo Puigdefabregas 49d19ec38e add dpp 2023-06-02 11:42:38 +02:00
Cayo Puigdefabregas 312f8a01bf add details for user validated 2023-06-02 11:00:05 +02:00
Cayo Puigdefabregas 4db71b2af4 add rols to session 2023-06-02 09:54:14 +02:00
Cayo Puigdefabregas 4a6c82ef55 isort 2023-05-31 18:29:00 +02:00
Cayo Puigdefabregas df6b09d051 new did endpoint 2023-05-31 16:30:49 +02:00
Cayo Puigdefabregas 5ceeba3af7 fix pdf 2023-05-31 10:54:11 +02:00
Cayo Puigdefabregas f423d5ea34 fix wb templates 2023-05-31 09:41:14 +02:00
Cayo Puigdefabregas 15b25d8aeb fix wb templates 2023-05-31 09:32:59 +02:00
Cayo Puigdefabregas 2c2cd19688 fix template 2023-05-31 09:17:01 +02:00
Cayo Puigdefabregas 851fc123e1 up version of wb 2023-05-31 09:14:06 +02:00
Cayo Puigdefabregas 1f913eebaa add version 14.4 2023-05-30 22:37:30 +02:00
Cayo Puigdefabregas ccbf2f98a7 new wbSettings templates 2023-05-30 22:29:01 +02:00
Cayo Puigdefabregas efacba6aab Merge branch 'testing' into new-trublo 2023-05-30 16:34:12 +02:00
Cayo Puigdefabregas 35ffb8239f fix pdf 2023-05-30 12:49:37 +02:00
Cayo Puigdefabregas a95d643755 fix eraseDataWipe in csv 2023-05-30 11:49:42 +02:00
Cayo Puigdefabregas 80f7d102e1 Merge branch 'testing' into bugfix/4381 2023-05-30 10:17:42 +02:00
Cayo Puigdefabregas 5af553b6a3 Merge branch 'master' into testing 2023-05-30 10:16:55 +02:00
Cayo Puigdefabregas 8c69585800 fix a bug of seting hid in components 2023-05-30 10:13:55 +02:00
Cayo Puigdefabregas 085c5151bc fix 2023-05-30 09:45:19 +02:00
Cayo Puigdefabregas 7990f4518b redirect in logout 2023-05-29 13:48:43 +02:00
Cayo Puigdefabregas 631bfa2774 change certificate pdf 2023-05-26 17:11:47 +02:00
Cayo Puigdefabregas 5eea698695 revert upgrade datawipe 2023-05-25 16:20:26 +02:00
Cayo Puigdefabregas b571b26433 upgrade datawipe to erasedatawipe 2023-05-25 10:57:40 +02:00
Cayo Puigdefabregas 46860660e0 fix modules calls 2023-05-24 12:26:52 +02:00
Cayo Puigdefabregas 838d9180ad fix teal import inm did resource 2023-05-24 10:27:31 +02:00
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 7a128e6e7f add link to oidc in user profile 2023-05-16 10:05:50 +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
Cayo Puigdefabregas 906dceed56 fix 2023-05-04 17:04:08 +02:00
Cayo Puigdefabregas acc5f6ed78 fix devices lot shared 2023-05-04 16:14:43 +02:00
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