Commit graph

1990 commits

Author SHA1 Message Date
Santiago L 772d527ba6
Merge pull request #277 from RubenPX/add-developement-stuff-js
Add developement build & precomit build (javascript)
2022-06-06 16:45:10 +02:00
cayop 9eb02e82a3
Merge pull request #290 from eReuse/feature/3436-search-bulk-dhid
add view for advanced search
2022-06-02 14:59:56 +02:00
Cayo Puigdefabregas 7ea93b58f6 fix basic test 2022-06-02 14:09:21 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Santiago L 6745dbbf7c
Merge pull request #282 from eReuse/dependabot/pip/pyjwt-2.4.0
Bump pyjwt from 2.0.0a1 to 2.4.0
2022-06-02 13:30:45 +02:00
Santiago L 560920c85a
Merge pull request #287 from RubenPX/fix/lots-button-out-of-card
fix apply button out of card
2022-06-02 13:26:05 +02:00
Santiago L 78f9c269a8
Merge pull request #285 from RubenPX/fix/lots-search
hotfix lots search not working
2022-06-02 13:25:34 +02:00
RubenPX 54295556f1 fix style 2022-05-31 11:25:32 +02:00
RubenPX 5b164221ae hotfix lots search not working 2022-05-30 19:28:16 +02:00
cayop 776c27a082
Merge pull request #284 from eReuse/bugfix/3385-bug-date-allocate
fixed bugs of allocate
2022-05-26 18:11:37 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
cayop cbba8c7908
Merge pull request #283 from eReuse/feature/3431-add-date-of-Registered
modify updated and add registered
2022-05-25 17:55:57 +02:00
Cayo Puigdefabregas ebe800158a modify updated and add registered 2022-05-25 17:37:24 +02:00
Cayo Puigdefabregas 83067fd2bb modify updated and add registered 2022-05-25 17:33:54 +02:00
dependabot[bot] e6e57e6608
Bump pyjwt from 2.0.0a1 to 2.4.0
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.0.0a1 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/2.0.0a1...2.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 05:05:46 +00:00
Santiago L 1bd0d6cc30
Merge pull request #280 from eReuse/bugfix/279-alembic
fix enums in migration process
2022-05-24 14:11:02 +02:00
Santiago L c2bff5dd92 Fix #279. Update existing enum 2022-05-24 14:08:23 +02:00
Santiago L e081310069 Apply pre-commit hook 2022-05-24 14:06:56 +02:00
Santiago L 7d7507c1d9
Merge pull request #273 from RubenPX/feature/lots-search
Feature: lots-search US 3334
2022-05-23 13:39:42 +02:00
Santiago L 20440a55ca Update CHANGELOG.md 2022-05-23 13:39:12 +02:00
Lint Action 14500ec4a2 Fix code style issues with ESLint 2022-05-22 17:01:11 +00:00
RubenPX 4164deae2e fix: only allow search when lots list is loaded 2022-05-22 19:00:26 +02:00
RubenPX 97ff171fa0 Change EOL CRLF to LF 2022-05-22 18:21:59 +02:00
RubenPX c13bc0f7ce fix dropdown not works when try to search DOM element 2022-05-22 18:20:04 +02:00
RubenPX c0a7415f33
Update ereuse_devicehub/templates/inventory/device_list.html
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-05-21 10:58:40 +02:00
RubenPX 79ce3dfc59 Load dev build on device_list 2022-05-18 11:16:22 +02:00
RubenPX e6399e9729 pre commit build js babel 2022-05-18 11:15:41 +02:00
cayop 8794223385
Merge pull request #276 from eReuse/bugfix/#3360-computermonitor-instead-monitor
computer monitor instead of monitor
2022-05-16 12:59:41 +02:00
Cayo Puigdefabregas d935c987b3 comiter monitor instead of monitor 2022-05-16 12:40:14 +02:00
Cayo Puigdefabregas 727c06c3de add public link to device list 2022-05-16 11:54:02 +02:00
cayop 9fdeef08ca
Merge pull request #275 from eReuse/change/#3370-Remove-components-in-filter
remove all components in the filter of the inventory
2022-05-16 11:31:11 +02:00
Cayo Puigdefabregas 3bd2dd79b1 remove all components in the filter of the inventory 2022-05-16 11:01:52 +02:00
cayop ac0d6c7a22
Merge pull request #274 from eReuse/feature/#3396-add-columns-status
Feature/#3396 add columns status
2022-05-16 10:50:48 +02:00
Cayo Puigdefabregas 0b78178ff4 fixed device public page 2022-05-16 10:29:07 +02:00
cayop 282b9490fb
Merge pull request #265 from eReuse/feature/#3100-wb-settings
Feature/#3100 wb settings
2022-05-16 10:18:45 +02:00
Cayo Puigdefabregas c1665ef4af Merge branch 'testing' into feature/#3396-add-columns-status 2022-05-16 10:16:23 +02:00
Cayo Puigdefabregas f7b6bdccb6 fix test_export_extended 2022-05-16 10:15:46 +02:00
Cayo Puigdefabregas ae221dadd1 fixed tests 2022-05-16 09:53:22 +02:00
RubenPX b329474a10 remove code dependecy 2022-05-13 21:54:03 +02:00
RubenPX ec0d9860f7 change map to forEach 2022-05-13 21:33:25 +02:00
RubenPX 6fef4616e5 eslint avoid class limit 2022-05-13 21:29:29 +02:00
RubenPX a10fb5a212 add Search functionality 2022-05-13 21:29:15 +02:00
RubenPX adde4f88e4 add lots search interface 2022-05-13 21:27:50 +02:00
Cayo Puigdefabregas dd081532ba #3402 change public page of device 2022-05-13 17:17:57 +02:00
Cayo Puigdefabregas 11913d68c3 fix state instead of states 2022-05-13 17:16:08 +02:00
Cayo Puigdefabregas 1dcebc0112 #3401 change the values of the status in the page of device details 2022-05-13 13:11:00 +02:00
Cayo Puigdefabregas d8c9bcbcf7 #3400 change the names of the status for the correct names 2022-05-13 13:06:04 +02:00
Cayo Puigdefabregas df44849ad3 add allocate status in devices export 2022-05-13 12:51:31 +02:00
Cayo Puigdefabregas 1b5f6412f0 #3397 add columns of status in the devices list 2022-05-13 12:17:14 +02:00
Santiago L af833a673a
Merge pull request #272 from RubenPX/Show-device-labels
Show lots on deviceList
2022-05-13 10:41:55 +02:00