Commit Graph

2884 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 98ebb0d902 Merge branch 'testing' into feature/3598-binding 2022-07-12 14:02:16 +02:00
Cayo Puigdefabregas 2d7e1fdffd fix script 2022-07-12 13:59:56 +02:00
dependabot[bot] dc083f9c16
Bump numpy from 1.21.6 to 1.22.0
Bumps [numpy](https://github.com/numpy/numpy) from 1.21.6 to 1.22.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](https://github.com/numpy/numpy/compare/v1.21.6...v1.22.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-12 11:49:52 +00:00
cayop 676b36811d
Merge pull request #312 from eReuse/feature/3518-define-placeholder
Feature/3518 define placeholder
2022-07-12 13:49:16 +02:00
Cayo Puigdefabregas 49ee618a6a Merge branch 'feature/3518-define-placeholder' into feature/3598-binding 2022-07-12 13:38:54 +02:00
Cayo Puigdefabregas 958a5f1815 fix unused 2022-07-12 13:31:38 +02:00
Cayo Puigdefabregas fb31ce69bc fix models 2022-07-12 13:23:24 +02:00
Cayo Puigdefabregas 0253eda736 fix test 2022-07-12 13:17:13 +02:00
Cayo Puigdefabregas 963f42b248 change debug in app 2022-07-12 11:39:27 +02:00
Cayo Puigdefabregas 9936a89171 Merge branch 'feature/3518-define-placeholder' of github.com:eReuse/devicehub-teal into feature/3518-define-placeholder 2022-07-12 11:25:58 +02:00
Cayo Puigdefabregas e3ca632177 add components as placeholder 2022-07-12 11:23:55 +02:00
Santiago L 6350bcd6a4 Merge branch 'testing' 2022-07-12 10:15:50 +02:00
Santiago L e6accae694 Release version 2.3.0 2022-07-12 10:11:30 +02:00
Santiago L 2491ab9137 Cosmetics and fix typos 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas 8f4d3e7063 modify changelog 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas 15a56a59ee fix flak8 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas a303b935a8 move extract_uuid to script folder 2022-07-12 10:11:30 +02:00
Cayo Puigdefabregas a21018a2d2 add binding relation 2022-07-11 15:36:45 +02:00
Santiago L 785833c1b7
Merge pull request #310 from eReuse/ci/house-keeping
Run Selenium as an independent workflow
2022-07-11 13:57:33 +02:00
Santiago L 214fbb6e37 Bump to Python 3.9 on actions
It's the version used on testing & production servers
2022-07-11 13:53:27 +02:00
Santiago L d6a2dc0a14 Bump actions versions 2022-07-11 13:46:52 +02:00
Santiago L f359aa6cfa Run Selenium as an independent workflow 2022-07-11 13:42:25 +02:00
Cayo Puigdefabregas 99238d69d8 resolve conflict 2022-07-11 09:35:03 +02:00
Cayo Puigdefabregas f60fdfe7a1 add selenium test 2022-07-10 07:21:11 +02:00
cayop 41d0b56369
Merge pull request #281 from eReuse/feature/3096-testing_selenium
Feature/3096 testing selenium
2022-07-10 07:18:49 +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 acc8015b92 changelog 2022-07-08 12:46:46 +02:00
cayop 02de86bd55
Merge pull request #309 from eReuse/bugfix/3553-export
fixed
2022-07-08 12:46:28 +02:00
Cayo Puigdefabregas fa45080a44 fixed 2022-07-08 12:21:07 +02:00
Cayo Puigdefabregas da56126653 fixing schema 2022-07-07 17:43:46 +02:00
Cayo Puigdefabregas c9cd68b817 resolve conflict 2022-07-07 16:33:43 +02:00
Cayo Puigdefabregas 1eed2f5773 remove schema of placeholder 2022-07-07 16:32:00 +02:00
Cayo Puigdefabregas 4507a3206c add secuence and remove schema for placeholder_log 2022-07-07 16:18:51 +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 d4824a4333 add placeholder log in form 2022-07-07 13:10:05 +02:00
Cayo Puigdefabregas d93f040453 add placeholder log models 2022-07-06 18:37:27 +02:00
Cayo Puigdefabregas 3af2645706 fix format of file 2022-07-05 18:36:27 +02:00
Cayo Puigdefabregas e8b957c697 call one time all lots reset 2022-07-05 18:18:29 +02:00
Cayo Puigdefabregas 3a06ade79f call one time all lots 2022-07-05 18:10:17 +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 3e2ed58b07 add number of devices to be created 2022-06-29 13:40:00 +02:00
Cayo Puigdefabregas ce2694f229 add test over placeholders 2022-06-29 11:51:39 +02:00
Cayo Puigdefabregas 01e1d6e0b7 add computers as placeholders 2022-06-29 11:51:03 +02:00