Commit Graph

1866 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 44985d07a1 add dhid as column in erasure section 2022-10-26 11:26:09 +02: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 9a157eaaee Merge branch 'master' into testing 2022-10-25 16:49:32 +02:00
Cayo Puigdefabregas 9d7869929c fix disks without placeholder 2022-10-25 11:10:39 +02:00
Cayo Puigdefabregas 4c2f37dfec resolve conflict 2022-10-24 18:33:40 +02:00
Cayo Puigdefabregas 4fa4a4c553 fix text error 2022-10-24 17:58:25 +02:00
Cayo Puigdefabregas b73526768b 2 computers with diferents motherboard with the same system-uuid 2022-10-24 17:46:57 +02:00
Cayo Puigdefabregas aba6548d9c add point 2022-10-21 18:23:33 +02:00
Cayo Puigdefabregas a5bf59c561 add template for Enhanced Secure Erasure 2022-10-21 17:43:21 +02:00
Cayo Puigdefabregas da7f03aa53 fix flask_mail 2022-10-20 17:31:33 +02:00
Cayo Puigdefabregas 469ce1c6e0 pass emails to templates 2022-10-20 12:51:20 +02:00
Cayo Puigdefabregas c93c143cc8 add token to user registration and admin email 2022-10-19 18:55:34 +02:00
Cayo Puigdefabregas 9e86f0e3ae send email 2022-10-19 13:35:53 +02:00
Cayo Puigdefabregas c2d81b1b29 Merge branch 'testing' into feature/3729-user-registration 2022-10-18 17:15:28 +02:00
Cayo Puigdefabregas c8a4b16667 CHANGELOG.md and change version 2022-10-18 17:01:38 +02:00
cayop f33499cb23
Merge pull request #385 from eReuse/bugfix/3957-unbinding
fix components placeholder in unbinding
2022-10-18 16:32:28 +02:00
Cayo Puigdefabregas 2a32ba47b8 fix components placeholder in unbinding 2022-10-18 13:48:03 +02:00
Cayo Puigdefabregas 106ab2f650 add tests and redirect from abstract device to twin page 2022-10-18 11:18:50 +02:00
Cayo Puigdefabregas fc86181311 change snapshot id for snapshot uuid 2022-10-18 09:49:54 +02:00
Cayo Puigdefabregas 5d5ed0c552 add version of isos 2022-10-17 19:01:53 +02:00
Cayo Puigdefabregas fb46f48461 fix text settings setup 2022-10-17 18:25:12 +02:00
Cayo Puigdefabregas fc297ee5f8 add is_server_erase in snapshot action 2022-10-17 18:07:16 +02:00
Cayo Puigdefabregas fee98f9d30 second version of layout for settings 2022-10-17 11:35:14 +02:00
Cayo Puigdefabregas 2e31af4dfa Merge branch 'testing' into changes/3861-setup 2022-10-17 09:36:53 +02:00
Cayo Puigdefabregas c9a3dbf6c6 fix template device list 2022-10-14 16:39:38 +02:00
Cayo Puigdefabregas a54942a8a8 add kangaroo form 2022-10-14 15:47:54 +02:00
Cayo Puigdefabregas ce09de4133 add tests 2022-10-14 15:33:43 +02:00
Cayo Puigdefabregas 6b173de5a8 setup kangaroo server 2022-10-13 18:21:44 +02:00
Cayo Puigdefabregas 5819154c5a fix layout print label 2022-10-11 18:04:25 +02:00
Cayo Puigdefabregas c8c542189a drop comments 2022-10-11 16:01:35 +02:00
Cayo Puigdefabregas b77d7abaa4 layout settings 2022-10-11 16:00:38 +02:00
Cayo Puigdefabregas b66871e9c2 first step for layout new settings 2022-10-10 17:44:20 +02:00
cayop 3914e72463
Merge pull request #379 from eReuse/changes/3925-datatime-representation
change representation data times
2022-10-10 13:50:31 +02:00
Cayo Puigdefabregas 9e41555a2f change representation data times 2022-10-10 13:24:31 +02:00
Cayo Puigdefabregas 0a657a3b45 fix tests transfer 2022-10-10 11:10:39 +02:00
Cayo Puigdefabregas 50882ee56a 3924 redirect cancel to reffered 2022-10-10 09:08:12 +02:00
Cayo Puigdefabregas 7775208b28 add prefix to lots name in the list of devices 2022-10-06 18:47:32 +02:00
Cayo Puigdefabregas abe3c44213 add new buttons for transfer 2022-10-06 16:56:12 +02:00
Cayo Puigdefabregas 4b1f92573a change type for type upload 2022-10-06 16:06:14 +02:00
Cayo Puigdefabregas 1cd929e06b move links identifier and data storage to top 2022-10-06 15:32:09 +02:00
Cayo Puigdefabregas cc105fd330 changes button documents in a transfer 2022-10-06 14:41:40 +02:00
Cayo Puigdefabregas 792cc1915f move buttons transfer, remove direction transfer 2022-10-06 14:29:40 +02:00
Cayo Puigdefabregas 3d4b74f0ca drop logo 2022-10-06 08:35:00 +02:00
Cayo Puigdefabregas 795d4a20fb up version 2022-10-05 15:05:20 +02:00
cayop 6bb43575b6
Merge pull request #371 from eReuse/changes/3888-phid
Changes/3888 phid
2022-10-05 14:23:24 +02:00
Cayo Puigdefabregas 74dde2e626 fix form new device 2022-10-05 13:44:29 +02:00
Cayo Puigdefabregas 722ee1a261 fix phid definition 2022-10-05 12:22:40 +02:00
Cayo Puigdefabregas 77d10661b3 drop phid from UploadPlaceholderForm and drop update placeholder form this form 2022-10-05 09:49:15 +02:00