Commit graph

782 commits

Author SHA1 Message Date
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 c14f40fccb add test 2022-11-03 17:49:18 +01:00
Cayo Puigdefabregas 74d10e1951 add test 2022-11-03 17:49:01 +01:00
Cayo Puigdefabregas 6ee62eb415 test 2022-11-03 13:28:49 +01:00
Cayo Puigdefabregas 04a3ec99de change response 2022-10-28 14:08:51 +02:00
Cayo Puigdefabregas 67cfac6adc fix tests 2022-10-28 10:08:11 +02:00
Cayo Puigdefabregas 045b7b4f95 fix test login 2022-10-27 10:43:08 +02:00
Cayo Puigdefabregas 563e2ec652 Merge branch 'master' into testing 2022-10-26 10:03:07 +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 4c2f37dfec resolve conflict 2022-10-24 18:33:40 +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 61bd4e0642 add tests 2022-10-20 15:59:17 +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 fc297ee5f8 add is_server_erase in snapshot action 2022-10-17 18:07:16 +02:00
Cayo Puigdefabregas ce09de4133 add tests 2022-10-14 15:33:43 +02:00
Cayo Puigdefabregas 0a657a3b45 fix tests transfer 2022-10-10 11:10:39 +02:00
Cayo Puigdefabregas 9c45665241 fix test 2022-10-06 17:16:53 +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 c97ef94101 fix tests 2022-10-05 13:45:06 +02:00
Cayo Puigdefabregas 6726d439bf fix test render print label 2022-09-29 17:24:00 +02:00
Santiago L 7245708807 Fix flake8 & reformat using black 2022-09-29 12:11:10 +02:00
Santiago L 332c1088c0 Fix can't compare offset-naive and offset-aware datetimes 2022-09-29 12:11:10 +02:00
Santiago L 7bae66e041 Fix E711, E713 2022-09-29 12:11:10 +02:00
Santiago L c232320d62 Fix flake8: E713, E501 2022-09-29 12:11:10 +02:00
Santiago L 5b99286994 E712 comparison to True should be 'if cond is True:' or 'if cond:' 2022-09-29 12:11:10 +02:00
Santiago L bf423ab515 Fix flake F841 variable assigned never used 2022-09-29 12:11:10 +02:00
Santiago L 814f36d4ee Drop "message" parameter of pytest.raises
Deprecated since version 4.1
https://docs.pytest.org/en/4.6.x/deprecations.html#raises-message-deprecated
2022-09-29 12:11:10 +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 0db1d2ed0e fix test 2022-09-23 10:27:29 +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
Cayo Puigdefabregas 324aceb04e fixing tests csv exports 2022-09-21 15:47:17 +02:00
Cayo Puigdefabregas ad9b9e4e83 add test exports actions erasure 2022-09-21 12:04:34 +02:00
Cayo Puigdefabregas 60e783258e fix basic test 2022-09-20 13:05:23 +02:00
Cayo Puigdefabregas e02644f75c add test for erasure list view 2022-09-20 12:20:30 +02:00
Cayo Puigdefabregas f60236e7b7 fix 2022-09-15 17:33:00 +02:00
Cayo Puigdefabregas a1febe8b3f modify abstract for snapshot and real for placeholder 2022-09-15 11:51:27 +02:00
Cayo Puigdefabregas 3040676f49 fix tests 2022-09-13 19:53:44 +02:00
Cayo Puigdefabregas d9d0dc533a change message when create a new real device 2022-09-13 13:17:05 +02:00
Cayo Puigdefabregas 3f4ad1d57a fix basic test 2022-09-09 13:44:51 +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 e598f8aabe resolve conflict 2022-09-07 10:35:50 +02:00
Cayo Puigdefabregas 04f8b630ac fix url in test_print_labels 2022-09-07 10:26:00 +02:00
Cayo Puigdefabregas 74a8472aa1 fix 11 test 2022-09-02 12:42:26 +02:00
Cayo Puigdefabregas 9bde9edc63 fix test actions 2022-09-01 11:10:37 +02:00
Cayo Puigdefabregas a222b37ecc fixing tests 2022-08-31 17:25:38 +02:00
Cayo Puigdefabregas b5a738c44a fix test print label in test_render 2022-08-29 17:22:29 +02:00
cayop eec5c7143c
Merge pull request #330 from eReuse/feature/3683-wb-page
Feature/3683 wb page
2022-08-12 10:55:30 +02:00
Cayo Puigdefabregas 29d69cd285 fix tests 2022-08-12 09:58:19 +02:00
Cayo Puigdefabregas 134a1cc313 fix csv files with placeholder datas 2022-08-10 10:23:57 +02:00
Cayo Puigdefabregas 5a970b0e9b fix tests binding unbinding 2022-08-09 13:19:58 +02:00
Cayo Puigdefabregas beb687b967 add binding and unbinding tests 2022-08-03 16:00:25 +02:00
Cayo Puigdefabregas 23ef1e2bae fix test basic 2022-08-02 18:01:28 +02:00
Cayo Puigdefabregas 72b34b3330 resolve conflict 2022-08-02 12:58:26 +02:00
Cayo Puigdefabregas 8728707bf7 fix csv files 2022-08-01 20:54:26 +02:00
Cayo Puigdefabregas bee420c1e7 fix tests quotes files 2022-08-01 20:40:42 +02:00
Cayo Puigdefabregas bc339a1cd9 fix test metrics 2022-08-01 20:06:47 +02:00
Cayo Puigdefabregas b75fd6873f fix render 2022-08-01 19:38:21 +02:00
Cayo Puigdefabregas e8b06d8e16 fix render 2022-08-01 19:38:09 +02:00
Cayo Puigdefabregas bfc568cd2e fix test bugs 2022-08-01 17:42:28 +02:00
Cayo Puigdefabregas d008bb2921 resolve conflicts 2022-07-25 18:16:09 +02:00
Cayo Puigdefabregas 8bec1fbd29 Merge branch 'change/3659-weekly-report' into testing 2022-07-25 16:03:08 +02:00
Cayo Puigdefabregas 21f2a9c49b fix tests 2022-07-22 17:53:09 +02:00
Cayo Puigdefabregas ee49b4a2dd fix test print labels 2022-07-21 16:51:02 +02:00
Cayo Puigdefabregas 5d9928bd70 fixed tests 2022-07-20 14:58:32 +02:00
Cayo Puigdefabregas 924d9941bc resolve conflict 2022-07-20 12:28:08 +02:00
Cayo Puigdefabregas c93f1360f8 fix export_devices 2022-07-20 11:52:36 +02:00
Cayo Puigdefabregas 02404c4277 fix export placeholders 2022-07-20 11:19:45 +02:00
Cayo Puigdefabregas 1167b3cb1e fix tests 2022-07-19 18:40:27 +02:00
Cayo Puigdefabregas aed23450df fix tests 2022-07-19 12:27:10 +02:00
Cayo Puigdefabregas d7b9d01165 fix test devices 2022-07-18 17:57:23 +02:00
Cayo Puigdefabregas b039e491dc Merge branch 'testing' into feature/3598-binding 2022-07-18 11:54:11 +02:00
Cayo Puigdefabregas 3a6032c17d add test for new placeholder from a lot adding from form 2022-07-18 11:28:02 +02:00
Cayo Puigdefabregas 83ea86705d test for add new placeholder in a lot 2022-07-18 10:56:05 +02:00
Cayo Puigdefabregas 2c6f831068 add a placeholder when arrive a snapshot 2022-07-13 11:23:18 +02:00
Cayo Puigdefabregas 0253eda736 fix test 2022-07-12 13:17:13 +02:00
Cayo Puigdefabregas 99238d69d8 resolve conflict 2022-07-11 09:35:03 +02:00
Cayo Puigdefabregas d028cd3c79 fix test selenium 2022-07-08 18:55:50 +02:00
Cayo Puigdefabregas cfb8706598 fix test selenium 2022-07-08 18:55:32 +02:00
Cayo Puigdefabregas b7aaa20879 resolve conclict 2022-07-08 17:33:58 +02:00
Cayo Puigdefabregas 2e3bc8137f add tests placeholder logs 2022-07-07 15:49:21 +02:00
Cayo Puigdefabregas c914705e29 add test files 2022-07-07 13:10:37 +02:00
Cayo Puigdefabregas bc8944a498 add manual edit placeholder 2022-07-05 18:09:47 +02:00
Cayo Puigdefabregas 71518ca2a5 add upload form placeholder 2022-07-04 11:26:24 +02:00
Cayo Puigdefabregas b22ea880dd fix add amount placeholder 2022-06-29 18:07:57 +02:00
Cayo Puigdefabregas 3dae7e3a58 ux menu 2022-06-29 17:31:54 +02:00
Cayo Puigdefabregas a4aced0238 add test crerate with amount laptops 2022-06-29 13:46:19 +02:00
Cayo Puigdefabregas ce2694f229 add test over placeholders 2022-06-29 11:51:39 +02:00
Cayo Puigdefabregas 5435d21828 add test for download snapshot 2022-06-24 15:23:24 +02:00
Cayo Puigdefabregas 18e051596c fixing system uuid as non physical property 2022-06-24 11:27:42 +02:00