Commit graph

1892 commits

Author SHA1 Message Date
Santiago L d218b19dd5 Release version 2.1.0 2022-05-11 17:24:59 +02:00
Santiago L 640cc99a71
Merge pull request #260 from RubenPX/fix/better-ui-selector
Show selected devices notification instead page select selection
2022-05-11 17:13:37 +02:00
RubenPX 411fe85b19 Check devices in current page 2022-05-11 11:20:25 +02:00
RubenPX cc7b453c06 Check initial state on dom loaded & check if has devices 2022-05-11 11:19:56 +02:00
RubenPX d27cc46f64 refactor device selection 2022-05-11 11:09:38 +02:00
RubenPX 881f56e3e4 Fix devices length comparation 2022-05-11 10:42:32 +02:00
Santiago L 4d354b377a
Merge pull request #258 from RubenPX/add-register-info-and-fix-text
#3333 - Add register info and fix text
2022-05-10 22:44:45 +02:00
cayop cbf8d68461
Merge pull request #262 from eReuse/changes/changelog
Changes/changelog
2022-05-10 11:03:39 +02:00
cayop 28cf52baab
Merge pull request #263 from eReuse/feature/#3325-new-features-filter
fix the All devices option
2022-05-10 11:03:23 +02:00
Cayo Puigdefabregas a54d57f4ab fix the All devices option 2022-05-10 10:22:22 +02:00
Cayo Puigdefabregas ae95e7c57a update CHANGELOG 2022-05-10 10:04:22 +02:00
Cayo Puigdefabregas f83163040c update CHANGELOG 2022-05-09 17:53:53 +02:00
cayop bb21ca6513
Merge pull request #261 from eReuse/feature/#3325-new-features-filter
fixed bug
2022-05-09 17:09:28 +02:00
Cayo Puigdefabregas d800c6950c fixed bug 2022-05-09 16:48:34 +02:00
cayop 74597f2125
Merge pull request #257 from eReuse/feature/#3325-new-features-filter
Feature/#3325 new features filter
2022-05-09 16:36:42 +02:00
RubenPX 3da1bdcad1 Show selected devices notify instead page select 2022-05-09 14:40:28 +02:00
RubenPX ec9074ae7c add register user dialog 2022-05-09 14:03:51 +02:00
RubenPX 651c0cb9d8 Fix text select lots instead devices 2022-05-09 13:57:17 +02:00
Cayo Puigdefabregas 04e4f4ff74 add generics filters 2022-05-09 13:43:02 +02:00
Cayo Puigdefabregas 252c5285d8 refactorice 2022-05-09 11:12:34 +02:00
cayop d4e6469ddf
Merge pull request #255 from eReuse/bugfix/#3352-status-device
fixed bug #3352
2022-05-09 10:44:24 +02:00
Cayo Puigdefabregas 8d9abb58e3 fixed bug #3352 2022-05-09 10:18:22 +02:00
Santiago L 84b384c47b
Merge pull request #254 from RubenPX/patch-1
Fix minor typos
2022-05-06 20:17:36 +02:00
Santiago L 4c16065afa Fix typo: Unassgined to Unassigned #3339 2022-05-06 20:15:35 +02:00
Santiago L 563f13ea43
Merge pull request #237 from RubenPX/feature/confirm-trade-changes
Create confirmation dialog on apply lots changes
2022-05-06 19:46:29 +02:00
Santiago L e1513e2ccf Fix typos 2022-05-06 19:44:59 +02:00
RubenPX 02cb36371a
Make title bigger (H1) 2022-05-06 08:40:49 +02:00
RubenPX eb5c109220 Merge commit '7177b0fbfda37e495387834c7f2342b78f6559c8' into feature/confirm-trade-changes 2022-05-06 08:26:37 +02:00
Santiago L 7177b0fbfd
Merge pull request #233 from RubenPX/filter-in-out-trades
Filter in out trades from lots selector
2022-05-06 07:58:11 +02:00
Santiago L 00c5070784
Merge pull request #241 from RubenPX/bugfix/various-fixes
Several bug fixes on selector & lot component
2022-05-06 07:52:15 +02:00
cayop 1a04b44dbe
Merge pull request #253 from eReuse/changes/#3327-drop-public-link-csv
drop download public links
2022-05-05 18:56:08 +02:00
Cayo Puigdefabregas 3ca7292448 drop download public links 2022-05-05 18:36:52 +02:00
cayop 3f9e771ad6
Merge pull request #252 from eReuse/feature/#3308-device-details
Feature/#3308 device details
2022-05-05 13:35:29 +02:00
Cayo Puigdefabregas af30453c12 fix message of allocate bug 2022-05-05 13:10:02 +02:00
Cayo Puigdefabregas 33fd574f18 add lots tab in device details 2022-05-05 12:31:29 +02:00
Cayo Puigdefabregas 1c670641f4 add web: public link in device details page 2022-05-05 12:00:40 +02:00
Cayo Puigdefabregas 1023f3fdca add public link in model 2022-05-05 12:00:02 +02:00
cayop 34f7989553
Merge pull request #251 from eReuse/bugfix/allocate-#3304
add checks of device.allocated
2022-05-05 11:37:06 +02:00
Cayo Puigdefabregas 9eda5c0466 add checks of device.allocated 2022-05-05 11:31:13 +02:00
cayop ce32db6d37
Merge pull request #250 from eReuse/change/#3300-change-color-blue
add color in bordered navs links
2022-05-04 18:10:34 +02:00
Cayo Puigdefabregas 9a74eabc23 add color in bordered navs links 2022-05-04 18:06:19 +02:00
cayop de53649aa8
Merge pull request #249 from eReuse/change/#3300-change-color-blue
fix sidebar
2022-05-04 17:43:53 +02:00
Cayo Puigdefabregas 074fd4e542 fix sidebar 2022-05-04 17:39:20 +02:00
cayop 9826185e26
Merge pull request #248 from eReuse/change/#3300-change-color-blue
fix login
2022-05-04 12:58:18 +02:00
Cayo Puigdefabregas f2a85af1c2 fix login 2022-05-04 12:53:22 +02:00
cayop bba1e57f13
Merge pull request #247 from eReuse/change/#3300-change-color-blue
change colors and log
2022-05-04 12:28:41 +02:00
Cayo Puigdefabregas 8a6b0cde37 change colors and log 2022-05-04 12:23:04 +02:00
RubenPX cb4f12eb1e Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes 2022-05-03 19:21:14 +02:00
RubenPX e30779fcde Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes 2022-05-03 19:20:59 +02:00
cayop 8591f061a8
Merge pull request #246 from eReuse/bugfix/change-lot-name
fix bug
2022-05-03 17:22:59 +02:00