Commit Graph

3189 Commits

Author SHA1 Message Date
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
cayop 31629b3f16
Merge pull request #449 from eReuse/changes/changes-filter-devices
hide submit in filter of list of devices
2023-05-04 17:25:06 +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 e845709027 fix test export lots 2023-05-04 10:35:20 +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 d3b624fbd1 drop pdb 2023-04-28 12:11:09 +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 0e3aa1ce04 fix tests 2023-04-21 16:20:30 +02:00
Cayo Puigdefabregas 075dc8d5b0 fix tests 2023-04-21 13:03:12 +02:00
Cayo Puigdefabregas 750d3e7db6 fix id supplier in export devices 2023-04-21 12:47:53 +02:00
cayop a47e99ce0b
Merge pull request #439 from eReuse/without-teal
Without teal
2023-04-20 18:25:04 +02:00
Cayo Puigdefabregas 8f5835fa4f fix test selenium 2023-04-20 18:07:12 +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
cayop 6dce475256
Merge pull request #445 from eReuse/feature/4319-add-columns-list-documents-device
fix FileField
2023-04-19 11:19:37 +02:00
Cayo Puigdefabregas 0ce12bbfba fix it 2023-04-18 18:15:44 +02:00
cayop 9e7a1ec5bd
Merge pull request #444 from eReuse/feature/4319-add-columns-list-documents-device
Feature/4319 add columns list documents device
2023-04-18 11:44:39 +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
cayop 2e0173b7dc
Merge pull request #443 from eReuse/feature/4109-documents-in-device
Feature/4109 documents in device
2023-04-17 11:41:12 +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
cayop 4059dc3a7a
Merge pull request #442 from eReuse/feature/4126-edit-documents
Feature/4126 edit documents
2023-03-29 14:11:06 +02:00
Cayo Puigdefabregas 509a445480 add edit document form 2023-03-29 13:40:27 +02:00
Cayo Puigdefabregas ca0b31059f Merge branch 'feature/4125-remove-documents' into feature/4126-edit-documents 2023-03-29 13:38:30 +02:00
Cayo Puigdefabregas 7d228a61f9 change name of link trade-document 2023-03-29 13:38:25 +02:00
cayop 8f8883242e
Merge pull request #441 from eReuse/feature/4125-remove-documents
allow remove a document
2023-03-29 11:32:04 +02:00
Cayo Puigdefabregas 8b69962374 fix test 2023-03-29 10:46:07 +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