Commit graph

2418 commits

Author SHA1 Message Date
Cayo Puigdefabregas bfc568cd2e fix test bugs 2022-08-01 17:42:28 +02:00
Cayo Puigdefabregas 2a9b6864be resolve conflict 2022-08-01 17:23:27 +02:00
Cayo Puigdefabregas c6bbaa0460 add quotation for results of csv 2022-08-01 16:13:55 +02:00
Cayo Puigdefabregas 063d20695f add quotation for results of csv 2022-07-29 18:30:58 +02:00
cayop 0c52598820
Merge pull request #322 from eReuse/drop-imei-form
commit validation imei for mobiles
2022-07-28 18:56:56 +02:00
Cayo Puigdefabregas 637308ee8f drop required of imei and meid 2022-07-28 18:34:34 +02:00
Cayo Puigdefabregas b0beff5b1d commit validation imei for mobiles 2022-07-28 18:12:49 +02:00
Cayo Puigdefabregas d5588bc871 Merge branch 'bugfix/3666-label' into testing 2022-07-25 18:13:52 +02:00
cayop eea6d5c7e7
Merge pull request #321 from eReuse/bugfix/3666-label
Bugfix/3666 label
2022-07-25 18:06:07 +02:00
Cayo Puigdefabregas ac9708c779 fix unlink tags 2022-07-25 17:38:08 +02:00
Cayo Puigdefabregas 31bd4d775b fix fields number for print label 2022-07-25 17:37:00 +02:00
Cayo Puigdefabregas 8bec1fbd29 Merge branch 'change/3659-weekly-report' into testing 2022-07-25 16:03:08 +02:00
cayop 5d2161c5e4
Merge pull request #319 from eReuse/change/3659-weekly-report
add report command cli
2022-07-25 16:02:57 +02:00
Cayo Puigdefabregas 21f2a9c49b fix tests 2022-07-22 17:53:09 +02:00
Cayo Puigdefabregas 429c9a1b15 add command cli: get_token 2022-07-22 17:49:51 +02:00
Cayo Puigdefabregas a74e242e20 add report command cli 2022-07-22 15:23:49 +02:00
Cayo Puigdefabregas 9f0edf5bd8 CHANGELOG.md 2022-07-21 16:46:01 +02:00
cayop 7ff9673bde
Merge pull request #318 from eReuse/bugfix/remove-tag
fix get id from js
2022-07-21 16:49:18 +02:00
Lint Action 0d2edef437 Fix code style issues with ESLint 2022-07-21 14:49:02 +00:00
Cayo Puigdefabregas a7e1daca79 fix get id from js 2022-07-21 16:30:35 +02:00
cayop fa7bb86974
Merge pull request #317 from eReuse/bugfix/3613-export-placeholder
Bugfix/3613 export placeholder
2022-07-20 12:17:34 +02:00
Cayo Puigdefabregas b0dca83a3a CHANGELOG.md 2022-07-20 12:11:37 +02:00
Cayo Puigdefabregas 61db45959b CHANGELOG.md 2022-07-20 12:08:55 +02:00
Cayo Puigdefabregas c93f1360f8 fix export_devices 2022-07-20 11:52:36 +02:00
Cayo Puigdefabregas 5d573e2305 Deactivate 'Devices Lots Spreadsheet' in unassigned list 2022-07-20 11:31:54 +02:00
Cayo Puigdefabregas 02404c4277 fix export placeholders 2022-07-20 11:19:45 +02:00
Cayo Puigdefabregas d51a3d3b56 Merge branch 'testing' of github.com:eReuse/devicehub-teal into testing 2022-07-18 11:53:18 +02:00
Cayo Puigdefabregas 5b2a4626c6 changelog 2022-07-18 11:53:07 +02:00
cayop f9fcc9697e
Merge pull request #315 from eReuse/bugfix/314-DeviceCreate
Bugfix/314 device create
2022-07-18 11:47:02 +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 26b322ba70 fix bug 2022-07-18 10:56:36 +02:00
Cayo Puigdefabregas 83ea86705d test for add new placeholder in a lot 2022-07-18 10:56:05 +02:00
Cayo Puigdefabregas 6a6c0e5182 show a error message creating placeholder device 2022-07-18 10:07:37 +02:00
Santiago L b915a561b8
Merge pull request #313 from eReuse/dependabot/pip/numpy-1.22.0
Bump numpy from 1.21.6 to 1.22.0 & reorder dependencies.
2022-07-15 12:17:26 +02:00
Santiago L b2f8fe3ed5 Reorder imports because sentry is an optional dep 2022-07-15 12:10:10 +02:00
Santiago L 5aa6f16ae0 Move selenium to requirements-dev.txt
and update actions to install dependencies from this file.
2022-07-15 12:03:06 +02:00
Santiago L 09412f9ee6 Move sentry & blinker to requirements-prod.txt
Use a separate file to requirements of production environment
2022-07-15 11:59:06 +02:00
Santiago L 05c6b9f47b Add comment to pandas dependencies 2022-07-15 11:58:27 +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 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
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