dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,948 Commits 106 Branches 71 Tags
Commit Graph

1473 Commits

Author SHA1 Message Date
Igor Kulikov
1e75f9f0e3 Merge with develop/3.4 2022-06-17 13:59:32 +03:00
Igor Kulikov
d982c09f68 Fix conflicts 2022-06-17 13:04:32 +03:00
Dmitriymush
97657284a8 fixes after review 2022-06-16 22:23:14 +03:00
Dmitriymush
4c860732b5 fixes after review 2022-06-16 22:13:57 +03:00
Dmitriymush
3114b40e32 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/6371 2022-06-16 22:10:44 +03:00
Dmitriymush
4ba6282263 editions after review 2022-06-16 22:10:30 +03:00
Vladyslav_Prykhodko
66cc42644e UI: Improvement image-map when image attr empty set default image 2022-06-16 15:18:25 +03:00
Igor Kulikov
3b6bd49d58 Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-14 11:19:14 +03:00
fe-dev
6ebd4120c1 UI: Remove padding 2022-06-14 10:21:01 +03:00
Andrii Shvaika
43cc99b9aa Merge remote-tracking branch 'origin/develop/3.4' into feature/entities-version-control 2022-06-13 16:28:01 +03:00
Igor Kulikov
0590c911cd
Merge pull request #6692 from ArtemDzhereleiko/AD/bug-fix/alarm-table-widget 
[3.4] UI: Bug fix of alarm widget table
 2022-06-13 12:49:17 +03:00
Igor Kulikov
18ec32f092 Merge with develop/3.4 2022-06-13 12:20:08 +03:00
Igor Kulikov
b5f052cbc5 Fix typo 2022-06-13 12:17:15 +03:00
Igor Kulikov
5fef80a990
Merge pull request #6690 from volodymyr-babak/bug/edge-fix-delayed-status 
[UI][3.4] Fixed bug with incorrect display of delayed status
 2022-06-10 18:05:07 +03:00
Igor Kulikov
54cc729bee
Merge pull request #6688 from vvlladd28/bug/dashboard-page/edit-widget 
[3.4] UI: Fixed incorrect switch edit widget panel when active add widget panel in dashboard page
 2022-06-10 18:03:58 +03:00
Igor Kulikov
d5082bf123
Merge pull request #6683 from vvlladd28/bug/knob-control/resize 
[3.4] UI: Fixed not correct work vertical resize in knob widget
 2022-06-10 18:01:58 +03:00
Igor Kulikov
a9eed7357d
Merge pull request #6475 from ArtemDzhereleiko/bug-fix/entities-table-sort 
[3.4] UI: Fixed entities table manual sort if pagination disabled
 2022-06-10 17:51:32 +03:00
Igor Kulikov
44749f1306
Merge pull request #5818 from desoliture1/alarmScheduleDynamicValues 
[3.4] Add support for dynamic values for schedules in alarm rules
 2022-06-10 17:46:32 +03:00
fe-dev
bae6acb3fe UI: Fix bug with filter and with entity name 2022-06-10 17:38:18 +03:00
Volodymyr Babak
bb8e6a0443 Fixed bug with incorrect display of delayed status 2022-06-10 17:32:12 +03:00
Vladyslav_Prykhodko
db840bf4d8 UI: Fixed incorrect show edit widget panel when active add widget panel in dashboard page 2022-06-10 15:45:26 +03:00
Vladyslav_Prykhodko
9c3febf664 UI: Fixed not correct work vertical resize in knob widget 2022-06-10 13:49:51 +03:00
fe-dev
863200d6e7 UI: refactoring 2022-06-09 18:02:31 +03:00
fe-dev
0725cd6600 Merge remote-tracking branch 'upstream/develop/3.4' into bug-fix/entities-table-sort 2022-06-09 17:54:42 +03:00
Igor Kulikov
2f982a1f53 Merge branch 'develop/3.4' into feature/entities-version-control 2022-06-09 17:09:34 +03:00
Igor Kulikov
9afdd97363
Merge pull request #6672 from kalutkaz/fix/pieFlotWidget 
[3.4] UI: Fix visual bugs in pie flot widget
 2022-06-09 16:55:51 +03:00
Igor Kulikov
83fca7827d
Merge pull request #6652 from kalutkaz/fix/dateRangeNavigationStyle 
[3.4] UI: Fix style in Date-range-navigator widget
 2022-06-09 16:50:11 +03:00
Igor Kulikov
7357d8effa
Merge pull request #6643 from ArtemDzhereleiko/AD/queues/improvement 
[3.4] UI: Improvement for queues
 2022-06-09 16:48:35 +03:00
Igor Kulikov
6521c720f1
Merge branch 'develop/3.4' into resource-service 2022-06-09 16:46:17 +03:00
Igor Kulikov
420c2725f1
Merge pull request #6496 from kalutkaz/fix/adaptMarkerTripAnimation 
[3.4] UI:Marker does not adapt when the entity has no data
 2022-06-09 16:34:24 +03:00
Igor Kulikov
697eef2e06
Merge pull request #6462 from kalutkaz/fix/displayHorizontalBarWidget 
[3.4] UI: Fix displaying 'Unit title' and 'value timestamp' for Digital gauges widgets
 2022-06-09 16:20:26 +03:00
Igor Kulikov
26310fa675
Merge pull request #6322 from pinkevmladchy/pinkevmladchy/Bug-in-zooming-of-the-Image-Map 
[3.4] UI: Bug in zooming of the Image Map
 2022-06-09 16:00:24 +03:00
kalutkaz
25f3cf640a updated scaling radius object 2022-06-09 13:25:19 +03:00
Dmitriymush
4479ccd730 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/6371 2022-06-07 17:56:04 +03:00
kalutkaz
676a2b645a deleteMinWidth 2022-06-07 13:26:04 +03:00
kalutkaz
4082d901d0 update Pie widgets 2022-06-07 11:27:06 +03:00
fe-dev
b61ce04420 UI: Fixed description for default created queues 2022-06-06 17:47:02 +03:00
fe-dev
2fecf128a0 UI: add for expansion panel header fix height 2022-06-06 16:13:33 +03:00
fe-dev
6f21de1d4d UI: Fix translation, console error and add height for menu visability 2022-06-06 13:33:01 +03:00
devaskim
9669da0442 Add resource service to widget context. 2022-06-03 23:06:34 +05:00
Igor Kulikov
73acb8e34f Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-02 14:11:13 +03:00
Igor Kulikov
da224c9651 UI: Implement dashboard version control 2022-06-02 14:10:56 +03:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
Igor Kulikov
a07583b31d Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-02 12:32:24 +03:00
Igor Kulikov
57a9a0a6d3 UI: Version load error handling 2022-06-02 12:32:10 +03:00
Viacheslav Klimov
468bc44d5d Merge with feature/entities-version-control 2022-06-02 12:04:58 +03:00
fe-dev
370919ef48 UI: fix trackby and add customtranslation title 2022-06-02 09:47:54 +03:00
YevhenBondarenko
96ea21e5db Merge branch 'feature/queue-entity' of github.com:YevhenBondarenko/thingsboard into feature/queue-entity 2022-06-01 22:01:03 +02:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
fe-dev
c377f80caa UI: Fix bugs 2022-06-01 19:14:09 +03:00