Commit Graph

2701 Commits

Author SHA1 Message Date
Santiago L abb675d9d3 Lock 2022-09-29 12:11:10 +02:00
Santiago L 51c42ad94f Lock marshmallow version 2022-09-29 12:11:10 +02:00
Santiago L a85e7c90e1 Manage dependencies using pip-tools
Add instructions to CONTRIBUTING.md & create requirements.in
2022-09-29 12:11:10 +02:00
Santiago L df73cd5657 Fix build-js pre-commit hook
Only run when main_inventory is run & discard parameters
passed by pre-commit which breaks babel command
2022-09-29 12:04:05 +02:00
cayop 7335c04f8e
Merge pull request #369 from eReuse/bugfix/test_data_storage
Bugfix/test data storage
2022-09-28 12:30:10 +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
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
cayop 187abd550d
Merge pull request #364 from eReuse/bugfix/3843-after-action-go-to
after do action from all device go to all device view
2022-09-27 10:25:40 +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
cayop 8627a7dd5f
Merge pull request #367 from eReuse/bugfix/3848-phid-erasure-host
get the phid of the computer from where created
2022-09-26 17:42:00 +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
Cayo Puigdefabregas bbe285516a CHANGELOG 2022-09-23 13:05:31 +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
cayop 83b790c97f
Merge pull request #362 from eReuse/feature/3790-snapshot-columns
add new columns to list of snapshots
2022-09-23 11:04:07 +02:00
Cayo Puigdefabregas 0db1d2ed0e fix test 2022-09-23 10:27:29 +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
cayop 9e82164662
Merge pull request #361 from eReuse/changes/3788-message-phid-error
changes messages for device add form
2022-09-22 13:46:00 +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
cayop 4c3851cbbd
Merge pull request #359 from eReuse/bugfix/3821-dhid_bk
fix dhid_bk
2022-09-22 10:49:34 +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
Cayo Puigdefabregas 324aceb04e fixing tests csv exports 2022-09-21 15:47:17 +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
cayop 06e1aac5a5
Merge pull request #356 from eReuse/feature/3809-new-export-hdds
Feature/3809 new export hdds
2022-09-21 12:22:46 +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
cayop 73881f4f25
Merge pull request #355 from eReuse/changes/3786-changes-link-templates
changes links
2022-09-20 18:15:44 +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
cayop a7994547b7
Merge pull request #354 from eReuse/bugfix/2656-certificates
fix titles of table
2022-09-20 17:37:50 +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
cayop b1736f68af
Merge pull request #352 from eReuse/bugfix/2656-certificates
fix exports certificate for placeholders
2022-09-20 16:41:00 +02:00
Cayo Puigdefabregas 6d8365564e fix exports certificate for placeholders 2022-09-20 16:02:25 +02:00
cayop d245ca21a6
Merge pull request #351 from eReuse/bugfix/2656-certificates
fix phid
2022-09-20 13:33:13 +02:00
Cayo Puigdefabregas 4d3ab6a70c fix phid 2022-09-20 13:31:21 +02:00