Commit Graph

2093 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 534adbba75 Merge branch 'master' into testing 2022-12-05 10:35:49 +01:00
Cayo Puigdefabregas 9a39f3ae9d fix bug 2022-12-05 10:05:12 +01:00
Cayo Puigdefabregas e3f01f4795 fix 2022-12-05 09:58:12 +01:00
Cayo Puigdefabregas 94a586f00b filter correct values 2022-12-02 10:08:03 +01:00
Cayo Puigdefabregas 39f19f676b Merge branch 'testing' into changes/4025-new-hid 2022-12-01 15:59:52 +01:00
Cayo Puigdefabregas a2626a0b58 add settings version to version column in snapshots log 2022-11-30 16:46:10 +01:00
Cayo Puigdefabregas 7c6290bd89 add settings version to snapshots model 2022-11-30 16:25:11 +01:00
Cayo Puigdefabregas 4fa6f9f343 Merge branch 'testing' into feature/3999-setings 2022-11-30 16:13:33 +01:00
Cayo Puigdefabregas 341a7b2034 fix bug privacity 2022-11-30 15:26:16 +01:00
Cayo Puigdefabregas fe9c2c1c2d fix bug privacity 2022-11-30 15:19:59 +01:00
Cayo Puigdefabregas e36f813d92 put prefix in lots in result of search 2022-11-30 13:28:17 +01:00
Cayo Puigdefabregas 7be17ead58 release 2.5.0 2022-11-30 13:10:49 +01:00
Cayo Puigdefabregas 0a6f9e3bf4 add settings_version to schema 2022-11-30 12:54:11 +01:00
Cayo Puigdefabregas 18281c95e5 remove system_uuid 2022-11-30 12:10:00 +01:00
Cayo Puigdefabregas 3f5ae9fefd change settings template 2022-11-30 11:55:32 +01:00
Cayo Puigdefabregas 785f72692a change settings template 2022-11-30 11:53:19 +01:00
cayop f49ba1f7ba
Merge pull request #413 from eReuse/bugfix/4124-documents-in-lot
fix orther without id
2022-11-30 11:27:27 +01:00
Cayo Puigdefabregas b1ad7b151d fix orther without id 2022-11-30 10:23:51 +01:00
cayop 4dff032fe6
Merge pull request #411 from eReuse/feature/4094-add-new-fields
Feature/4094 add new fields
2022-11-29 18:11:55 +01:00
Cayo Puigdefabregas d2a4c0ef83 Merge branch 'testing' into bugfix/4122-snapshots-log-type-upload 2022-11-29 18:10:36 +01:00
Cayo Puigdefabregas 4be07130c2 fixed 2022-11-29 18:09:53 +01:00
Cayo Puigdefabregas 040421172f fix definition of others 2022-11-29 17:46:41 +01:00
Cayo Puigdefabregas c392270676 add others device 2022-11-29 16:49:23 +01:00
Cayo Puigdefabregas b84f379468 Merge branch 'testing' into feature/4094-add-new-fields 2022-11-29 10:09:10 +01:00
Cayo Puigdefabregas 9ee24c3e82 put simple table as cdn 2022-11-28 17:09:32 +01:00
Cayo Puigdefabregas 07f947b1ad fix search 2022-11-28 17:00:30 +01:00
Cayo Puigdefabregas 79fbe323a2 try fix 2022-11-28 16:39:43 +01:00
Cayo Puigdefabregas b39388bef0 fix 2022-11-28 15:24:31 +01:00
Cayo Puigdefabregas 994cd3c6ca Merge branch 'feature/4107-search' of github.com:eReuse/devicehub-teal into feature/4107-search 2022-11-28 15:10:29 +01:00
Cayo Puigdefabregas 9da321a925 fix 2022-11-28 15:10:12 +01:00
Lint Action 368d82c007 Fix code style issues with ESLint 2022-11-28 14:05:48 +00:00
Cayo Puigdefabregas 0b6cfb210d add advanced search as top search 2022-11-28 15:00:45 +01:00
Cayo Puigdefabregas 3757873b02 fix bug Title tag in erasure list 2022-11-28 13:12:14 +01:00
Cayo Puigdefabregas f9d679547f pagination in placeholder logs 2022-11-28 12:30:02 +01:00
Cayo Puigdefabregas 5e2dd3344b add pagination to snapshots logs 2022-11-28 11:58:42 +01:00
Cayo Puigdefabregas abc773fe6e add pagination in all list of devices 2022-11-25 18:56:56 +01:00
Cayo Puigdefabregas 3a952324c2 change value per_page 2022-11-24 14:02:56 +01:00
cayop 4ae9eeb4c7
Merge pull request #408 from eReuse/feature/3988-real-pagination
Feature/3988 real pagination
2022-11-24 13:55:42 +01:00
Cayo Puigdefabregas a544549a81 clean 2022-11-24 12:21:42 +01:00
Cayo Puigdefabregas 0f033c8d83 clean 2022-11-24 11:59:18 +01:00
Cayo Puigdefabregas d7500a2596 add pagination to all devices view 2022-11-24 11:50:56 +01:00
Cayo Puigdefabregas 925ce473e6 put the correct links 2022-11-23 19:22:49 +01:00
Cayo Puigdefabregas ade9fbd018 add raw query 2022-11-23 19:22:26 +01:00
Cayo Puigdefabregas 1efc650bea add simpledatatables 2022-11-23 16:13:30 +01:00
Cayo Puigdefabregas a9504b0b71 first step for pagination 2022-11-23 13:36:34 +01:00
Cayo Puigdefabregas ac535cc9b5 add new fields in the filters 2022-11-22 15:44:44 +01:00
Cayo Puigdefabregas 796f49f6cf show correctly the ids in the templates 2022-11-22 12:00:17 +01:00
Cayo Puigdefabregas 7bf879bbcf add my_partner for get the partner of one device 2022-11-22 11:59:31 +01:00
Cayo Puigdefabregas 67cf797c6c fixing name hardDrive in filter 2022-11-22 11:58:56 +01:00
Cayo Puigdefabregas 2d67c9afd2 version 2022-11-21 17:37:51 +01:00
Cayo Puigdefabregas 6fd87ac8e8 fix label dhid 2022-11-21 15:34:00 +01:00
Cayo Puigdefabregas fb430f2138 add lot to list erasure 2022-11-21 15:14:02 +01:00
Cayo Puigdefabregas 35dd08c9c8 fixing add hdd to lot 2022-11-21 15:13:36 +01:00
Cayo Puigdefabregas a09e087b0e add tab for Hard drives without device 2022-11-21 13:24:56 +01:00
Cayo Puigdefabregas d1eed13b0a tabs 2022-11-18 18:46:10 +01:00
Cayo Puigdefabregas 905716f74b fix live view 2022-11-18 10:20:57 +01:00
Cayo Puigdefabregas f0ffe27671 fix device set_hid 2022-11-16 17:40:35 +01:00
Cayo Puigdefabregas d030ed9b23 set_old_hid 2022-11-16 13:47:50 +01:00
Cayo Puigdefabregas 236fcac0b8 add new hid in devices 2022-11-16 11:51:31 +01:00
Cayo Puigdefabregas 0ae12e71a6 Merge branch 'master' into testing 2022-11-14 10:23:32 +01:00
Cayo Puigdefabregas 17df239599 fixing table.rows() 2022-11-14 10:00:33 +01:00
Cayo Puigdefabregas b99be1a144 change delimiter 2022-11-11 18:26:15 +01:00
Cayo Puigdefabregas 79dff1d361 add reset password link in login page 2022-11-11 17:42:29 +01:00
Cayo Puigdefabregas 25f2287e98 fix db_host 2022-11-08 18:35:47 +01:00
cayop fe33f2d7e7
Merge pull request #400 from eReuse/bugfix/4046-drop-register-user
remove user_registration
2022-11-08 18:12:56 +01:00
Cayo Puigdefabregas 4df33e8808 remove user_registration 2022-11-08 13:32:29 +01:00
Cayo Puigdefabregas 79877d09a1 put api_host in config 2022-11-07 17:08:03 +01:00
Cayo Puigdefabregas 41eb390e39 Merge branch 'master' into testing 2022-11-07 11:56:16 +01:00
Cayo Puigdefabregas b2205c56f9 add obada standard 2022-11-04 10:37:56 +01:00
cayop c784fb7499
Merge pull request #396 from eReuse/changes/3853-report
Changes/3853 report
2022-11-03 23:56:57 +01:00
Cayo Puigdefabregas 09a0a30386 fixing bug 2022-11-03 18:19:56 +01:00
Cayo Puigdefabregas 6c7ae1bb75 remove report of devicehub commands 2022-11-02 19:44:39 +01:00
Cayo Puigdefabregas eae036d7c0 remove internal stats of actual devicehub 2022-11-02 12:00:39 +01:00
Cayo Puigdefabregas 04a3ec99de change response 2022-10-28 14:08:51 +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 61f2507ead new login style 2022-10-26 18:04:16 +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
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
Cayo Puigdefabregas 926f65e291 id internal in device details 2022-10-05 09:19:16 +02:00
Cayo Puigdefabregas 120646289c id internal when create a new placeholder, wbform 2022-10-05 09:18:42 +02:00
Cayo Puigdefabregas 02f394d81e add id_internal in placeholder model 2022-10-05 09:17:27 +02:00
Cayo Puigdefabregas 45ae96ce33 add id_internal and update phid incremental per user 2022-10-05 09:16:16 +02:00
Cayo Puigdefabregas a9d6ac22f9 mail sender 2022-09-30 19:05:10 +02:00
Cayo Puigdefabregas 9184edf9b1 add mail configs 2022-09-30 19:04:37 +02:00
Cayo Puigdefabregas 6357a15f01 fix migrations 2022-09-30 17:54:26 +02:00
Cayo Puigdefabregas e61a1d88bd unique identifier instead of tags in print label 2022-09-29 12:30:25 +02:00
Cayo Puigdefabregas 74166019b2 rebuild view for label details 2022-09-29 12:20:06 +02:00
Cayo Puigdefabregas d36008934a details in register 2022-09-28 17:51:31 +02:00
Cayo Puigdefabregas 60992a13da change 100 for None 2022-09-28 11:55:31 +02:00
Cayo Puigdefabregas ab06bd5f44 fix remain_lifetime_percentage 2022-09-28 11:10:34 +02:00
Cayo Puigdefabregas 76c5100fa3 return to copy base 2022-09-28 10:48:41 +02:00
cayop 2aa8f95817
Merge pull request #368 from eReuse/bugfix/migrations-monitors
add migrations for monitors and mobiles
2022-09-27 15:04:48 +02:00
Cayo Puigdefabregas 121012c1f8 add migrations for monitors and mobiles 2022-09-27 13:02:27 +02:00
Cayo Puigdefabregas b2918852b6 add migrations for monitors and mobiles 2022-09-27 12:51:31 +02:00
Cayo Puigdefabregas 59d8355728 fix tests 2022-09-27 10:05:49 +02:00
Cayo Puigdefabregas 5614eb36f8 Merge branch 'testing' into bugfix/3843-after-action-go-to 2022-09-27 09:44:45 +02:00
Cayo Puigdefabregas a0c938c044 get the phid of the computer from where created 2022-09-26 17:22:01 +02:00
Cayo Puigdefabregas e589cedb49 fix it 2022-09-26 11:42:50 +02:00
Cayo Puigdefabregas 194fe366fd fix bug 3841 2022-09-26 08:14:04 +02:00
Cayo Puigdefabregas 5f745ad04a change version 2022-09-23 13:29:36 +02:00
cayop 2ecec6590a
Merge pull request #363 from eReuse/bugfix/3831-bug-documents
fix bug and test
2022-09-23 12:20:05 +02:00
Cayo Puigdefabregas c5619518f5 fix bug and test 2022-09-23 11:54:19 +02:00
Cayo Puigdefabregas 3b7d396670 no fix now bug 3831 2022-09-23 09:58:14 +02:00
Cayo Puigdefabregas baa48bf5cd add new columns to list of snapshots 2022-09-22 19:14:11 +02:00
Cayo Puigdefabregas d8e33e680d changes messages for device add form 2022-09-22 13:16:14 +02:00
cayop 9ac3781f82
Merge pull request #360 from eReuse/bugfix/3819-snapshot-in-lot
add placeholder device in lot instead of snapshot device
2022-09-22 12:35:41 +02:00
Cayo Puigdefabregas 45a21eb210 add placeholder device in lot instead of snapshot device 2022-09-22 12:08:37 +02:00
Cayo Puigdefabregas 0f6364f075 fix dhid_bk 2022-09-22 10:15:37 +02:00
cayop 553f85776a
Merge pull request #358 from eReuse/changes/3791-changes-export-device
Changes/3791 changes export device
2022-09-21 16:10:59 +02:00
cayop f898e0c669
Merge pull request #357 from eReuse/changes/3787-new-actions
change New Actions for Actions
2022-09-21 13:11:50 +02:00
Cayo Puigdefabregas a9947fd93f changes order of columns in export devices 2022-09-21 13:04:57 +02:00
Cayo Puigdefabregas 1292ddbd26 change New Actions for Actions 2022-09-21 12:29:16 +02:00
Cayo Puigdefabregas ad9b9e4e83 add test exports actions erasure 2022-09-21 12:04:34 +02:00
Cayo Puigdefabregas 47736c8679 add new export actions erasure 2022-09-21 11:35:31 +02:00
Cayo Puigdefabregas b006ec1973 new export actions erasure 2022-09-21 09:42:31 +02:00
Cayo Puigdefabregas fed030dd65 changes links 2022-09-20 17:57:37 +02:00
cayop 26a803d1ab
Merge pull request #353 from eReuse/bugfix/2656-update-in-list
get the last update of one device
2022-09-20 17:52:17 +02:00
Cayo Puigdefabregas 5642d3880e fix titles of table 2022-09-20 17:36:09 +02:00
Cayo Puigdefabregas c3aa1edd5a get the last update of one device 2022-09-20 17:25:09 +02:00
Cayo Puigdefabregas 6d8365564e fix exports certificate for placeholders 2022-09-20 16:02:25 +02:00
Cayo Puigdefabregas 4d3ab6a70c fix phid 2022-09-20 13:31:21 +02:00
Cayo Puigdefabregas 31c903230a fix uuid of snapshot 2022-09-20 12:43:04 +02:00
Cayo Puigdefabregas e02644f75c add test for erasure list view 2022-09-20 12:20:30 +02:00
Cayo Puigdefabregas ff765f38f8 add view for list of hdd eraseds 2022-09-20 10:27:02 +02:00
Cayo Puigdefabregas 1ec0f83d28 add erasure total counts 2022-09-19 14:04:30 +02:00
Cayo Puigdefabregas b118edb0a9 erasure only one time for row and disk 2022-09-19 12:10:34 +02:00
Cayo Puigdefabregas b597fdd372 add new colums in report 2022-09-19 11:58:56 +02:00
Cayo Puigdefabregas c50403d95e change buttons new device 2022-09-15 17:11:06 +02:00
Cayo Puigdefabregas a1febe8b3f modify abstract for snapshot and real for placeholder 2022-09-15 11:51:27 +02:00
Cayo Puigdefabregas 726627d69a change editable for real 2022-09-14 18:45:40 +02:00
Cayo Puigdefabregas cf0cd9faa0 remove generation concept in form create device 2022-09-14 18:09:44 +02:00
Cayo Puigdefabregas cb48cc9f65 Merge branch 'testing' into bugfix/3772-excel-name 2022-09-14 16:30:56 +02:00
Cayo Puigdefabregas 0ed523ca5c add Ods File as description in Placeholders Log 2022-09-14 15:43:34 +02:00
Cayo Puigdefabregas 708c2cbdfa forze Phid to be string 2022-09-14 14:58:54 +02:00
Cayo Puigdefabregas 5c644d9a9a change binding for new twin 2022-09-14 13:13:03 +02:00
Cayo Puigdefabregas b39b61bede add part number in device details 2022-09-13 20:03:10 +02:00
Cayo Puigdefabregas d215008927 add part number 2022-09-13 18:15:50 +02:00
Cayo Puigdefabregas d9d0dc533a change message when create a new real device 2022-09-13 13:17:05 +02:00
Cayo Puigdefabregas 9969e6594d update the message of upload placeholders 2022-09-12 17:38:29 +02:00
Cayo Puigdefabregas ce666692b3 change visual description of upload placeholders 2022-09-12 13:15:18 +02:00
Cayo Puigdefabregas 2528775296 change parth for part in device details 2022-09-12 11:37:34 +02:00
Cayo Puigdefabregas 6079e34627 fix name 2022-09-12 11:32:15 +02:00
Cayo Puigdefabregas f3b03a1d46 fix upload csv placeholders 2022-09-12 10:55:49 +02:00
Cayo Puigdefabregas fcff7e8d02 change only_unassigned for one specific url 2022-09-09 11:48:23 +02:00
Cayo Puigdefabregas ec844a7376 fixing bigs of excel with phid with nan 2022-09-08 14:04:49 +02:00
Cayo Puigdefabregas 5913733404 fix tests 2022-09-07 16:23:31 +02:00
Cayo Puigdefabregas c421bdad94 resolve conflict 2022-09-07 14:10:11 +02:00
Cayo Puigdefabregas e7a772dee7 drop S of SHA512SUMS in Template settings workbench 2022-09-07 14:04:54 +02:00
Cayo Puigdefabregas f19046b2ef add backups for the abstract phid and dhid 2022-09-07 14:04:09 +02:00
Nadeu 015978b327
Update wb iso 2022 to 2022.8.0-beta 2022-09-07 13:33:43 +02:00
Cayo Puigdefabregas aee34e4989 drop / of url 2022-09-07 11:14:13 +02:00