trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,120 Commits 19 Branches 14 Tags 7.2 MiB
Commit Graph

2120 Commits

Author SHA1 Message Date
Lint Action 4f72654f50 Fix code style issues with ESLint 2022-05-09 09:10:08 +00:00
RubenPX 2e42b08519 use babel to support old browsers 2022-05-09 11:07:57 +02:00
RubenPX 275b7ad0c5 fix declaration variable 2022-05-09 11:06:48 +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 eca2795857 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 18:52:59 +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 e34b591690 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 13:32:32 +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 875fe7a340 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 18:07:23 +02:00
Cayo Puigdefabregas 9a74eabc23 add color in bordered navs links 2022-05-04 18:06:19 +02:00
Cayo Puigdefabregas 20fc9ded06 fix url response 2022-05-04 17:58:14 +02:00
Cayo Puigdefabregas 780b7d4ef2 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 17:56:30 +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 8cd2f22fcc Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 12:55:10 +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 16b8b4c78f Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 12:25:44 +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
Cayo Puigdefabregas d2b63af17a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-03 17:20:09 +02:00
Cayo Puigdefabregas eaf8bdef65 fix bug 2022-05-03 17:00:02 +02:00
RubenPX 2aab4b49d3 Allow user to cancel all selection 2022-05-03 12:52:26 +02:00
RubenPX 9d9514e68b Select full list devices 2022-05-03 12:13:15 +02:00
RubenPX e31e3d3d45 Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes 2022-05-03 11:10:19 +02:00
RubenPX d7f7e4d2e5 fixed api not working on recive full list 
Api needs filter devices to work well
 2022-05-03 11:06:05 +02:00
Cayo Puigdefabregas db648a1bb0 fix render tests 2022-04-29 19:59:52 +02:00
Cayo Puigdefabregas 67ee1cdde8 resolve conflict 2022-04-29 19:26:44 +02:00
cayop 60a11794ae
Merge pull request #243 from eReuse/bugfix/#3288-common-lots 
Bugfix/#3288 common lots
 2022-04-29 19:25:55 +02:00
cayop 861515c46d
Merge pull request #229 from eReuse/feature/server-side-render-testing 
Feature/server side render testing
 2022-04-29 18:39:37 +02:00