Commit Graph

2763 Commits

Author SHA1 Message Date
cayop 2252fe93cd
Merge pull request #393 from eReuse/features/3969-improvements-login
Features/3969 improvements login
2022-10-28 10:40:44 +02:00
Cayo Puigdefabregas 67cfac6adc fix tests 2022-10-28 10:08:11 +02:00
Cayo Puigdefabregas 4bbec903ef refactor in a module register 2022-10-27 20:10:08 +02:00
Cayo Puigdefabregas 7041bfcf76 change email text 2022-10-27 18:22:54 +02:00
Cayo Puigdefabregas 045b7b4f95 fix test login 2022-10-27 10:43:08 +02:00
Cayo Puigdefabregas 61f2507ead new login style 2022-10-26 18:04:16 +02:00
cayop eb1649f506
Merge pull request #391 from eReuse/feature/3959-dhid-in-erasure
add dhid as column in erasure section
2022-10-26 12:08:07 +02:00
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
cayop 0aa4696fe0
Merge pull request #390 from eReuse/bugfix/edit-placeholder
fix image in edit device
2022-10-26 10:03:56 +02:00
Cayo Puigdefabregas 7c4a3bd770 tests 2022-10-26 09:43:01 +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
cayop dfdbf8f1f7
Merge pull request #389 from eReuse/bugfix/3960-datastorage-details
Bugfix/3960 datastorage details
2022-10-25 16:40:53 +02:00
Cayo Puigdefabregas 694663c412 add script for rebuild disks without placeholder 2022-10-25 15:09:03 +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
cayop 95ac4e794b
Merge pull request #388 from eReuse/bugfix/3962-system-uuid
2 computers with diferents motherboard with the same system-uuid
2022-10-24 18:27:46 +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
cayop 9d3b54c593
Merge pull request #387 from eReuse/changes/3861-setup
add template for Enhanced Secure Erasure
2022-10-21 18:53:01 +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
cayop 13605abbaf
Merge pull request #386 from eReuse/feature/3729-user-registration
Feature/3729 user registration
2022-10-20 18:03:09 +02:00
Cayo Puigdefabregas 72b139a2bc fix requirements 2022-10-20 17:41:06 +02:00
Cayo Puigdefabregas da7f03aa53 fix flask_mail 2022-10-20 17:31:33 +02:00
Cayo Puigdefabregas 61bd4e0642 add tests 2022-10-20 15:59:17 +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
cayop 177fbe1109
Merge pull request #384 from eReuse/feature/3830-redirect-to-twin
add tests and redirect from abstract device to twin page
2022-10-18 11:45:39 +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
cayop 00e40cbdeb
Merge pull request #383 from eReuse/changes/3861-setup
Changes/3861 setup
2022-10-17 18:48:14 +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
cayop fa990fe050
Merge pull request #382 from eReuse/features/3858-storage-management
fix template device list
2022-10-14 17:02:34 +02:00
Cayo Puigdefabregas c9a3dbf6c6 fix template device list 2022-10-14 16:39:38 +02:00
cayop 99dfe40984
Merge pull request #381 from eReuse/features/3858-storage-management
Features/3858 storage management
2022-10-14 16:05:15 +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