Commit Graph

3210 Commits

Author SHA1 Message Date
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
cayop 290c20d46e
Merge pull request #440 from eReuse/feature/4174-report-devices
add lots in export devices
2023-03-27 17:35:22 +02:00
Cayo Puigdefabregas 4b9f1c02b9 fix render test 2023-03-27 17:17:13 +02:00
Cayo Puigdefabregas 745b9966df add lots in export devices 2023-03-27 16:34:25 +02:00
Cayo Puigdefabregas f3926e3b92 fix import in tests 2023-03-27 11:13:58 +02:00
Cayo Puigdefabregas 309b266fe9 fix import in tests 2023-03-27 11:07:30 +02:00
Cayo Puigdefabregas e6c07851d4 fix lint checks 2023-03-27 10:55:26 +02:00
Cayo Puigdefabregas e6f91db4e4 correct versions of dependencies 2023-03-27 10:22:08 +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
cayop 91d13808a7
Merge pull request #437 from eReuse/bugfix/4283-replace-erasure-sanitization
Bugfix/4283 replace erasure sanitization
2023-03-20 18:01:51 +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
cayop 494a14c7f0
Merge pull request #436 from eReuse/bugfix/doc-erasure-fix-hid
fix hide hid of erasure certificate
2023-03-15 17:50:39 +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
cayop 56c970e810
Merge pull request #434 from eReuse/bugfix/4281
Bugfix/4281
2023-03-13 18:25:47 +01:00
Cayo Puigdefabregas e7833c1727 fix test 2023-03-13 17:59:08 +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