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

1370 Commits

Author SHA1 Message Date
Igor Kulikov
6f2a4409c1
Merge pull request #4059 from vvlladd28/bug/entities-panel/merge-additional-info 
Fixed merge additional info at updated entity
 2021-02-04 19:23:39 +02:00
Vladyslav_Prykhodko
22a1d24291 Added to widgets bundles and widget functional preview and description 2021-02-04 19:00:28 +02:00
Vladyslav_Prykhodko
58c12d1212 Fixed merge additional info at updated entity 2021-02-04 13:06:22 +02:00
Igor Kulikov
4c87b36a92 Minor fixes 2021-02-03 17:58:12 +02:00
Volodymyr Babak
28f5d9ed9e Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-03 17:42:29 +02:00
Igor Kulikov
b89e22e139 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-02-03 12:22:09 +02:00
Igor Kulikov
3ea5314495 Home dashboard feature. Enable tooltips for flot chars in mobile mode. Disable widgets interaction in widget library and when adding widget to dashboard. 2021-02-03 12:21:55 +02:00
Igor Kulikov
b71e0e3c81
Merge pull request #4043 from ChantsovaEkaterina/improvement/replace-deprecated-portal-injector 
Refactoring: replace deprecated PortalInjector
 2021-02-02 16:33:44 +02:00
Igor Kulikov
095dbc6390
Merge pull request #4038 from ChantsovaEkaterina/bug/timeseries-table-show-ms 
Timeseries table: show correct milliseconds value
 2021-02-02 16:31:42 +02:00
Igor Kulikov
646d11e997
Merge pull request #4037 from Terny22/paginator-new-buttons 
Added First/Last page-buttons to the tables-paginator
 2021-02-02 16:31:02 +02:00
Chantsova Ekaterina
64d4d90165 Refactoring: replace deprecated PortalInjector 2021-02-02 15:20:43 +02:00
Vladyslav Prykhodko
96bea44604 UI: Fixed show widget action dialog in Safari browser 2021-02-02 00:45:42 +02:00
Chantsova Ekaterina
8860985a49 Make table to show correct milliseconds value 2021-02-01 18:36:18 +02:00
Sergey Tarnavskiy
949d4db526 Added First/Last page-buttons to the tables-paginator 2021-02-01 17:19:00 +02:00
Javier Núñez
1cd4f950b6 Sync spanish translations, add device profile, tenant profiles, oauth, API usage 2021-02-01 12:05:07 +01:00
Igor Kulikov
34aab3287b
Merge pull request #4002 from ponv/master 
Dynamic color for data points
 2021-01-29 14:04:42 +02:00
Vladyslav_Prykhodko
034ea03f24 Refactoring code to dynamic color point in trip-animation widget 2021-01-29 14:02:48 +02:00
nickAS21
d56c33ddb1 Lwm2m: front: refactoring 2021-01-29 12:44:31 +02:00
nickAS21
4382c0c4b8 Lwm2m: front: fix bug2 updateObserve...ToJson 2021-01-29 09:05:53 +02:00
nickAS21
e32e90932b Lwm2m: front: fix bug updateObserve...ToJson 2021-01-28 19:27:24 +02:00
nickAS21
ac89b188f2 Lwm2m: front: fix any bug 2021-01-28 16:53:13 +02:00
PetrTodorov
e4fe3f399b Updated Czech translation 2021-01-28 15:11:50 +01:00
Volodymyr Babak
c05de7c94b Fix UI compilation 2021-01-27 15:19:09 +02:00
Volodymyr Babak
499eb1aef4 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-01-27 15:12:58 +02:00
Vladyslav_Prykhodko
2b47fe9202 Updated license header 2021-01-27 13:38:12 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
nickAS21
5f3cf1e3a2 Lwm2m: front: update filter for keyName 2021-01-26 22:10:26 +02:00
ponvalavan annamalai
68eebaf041 removed spaces -dynamic color for data points 2021-01-26 18:15:00 +00:00
ponvalavan annamalai
0219b8a6fd Dynamic color for data points 2021-01-26 18:12:21 +00:00
ponvalavan annamalai
fc40047a5e Dynamic color for data points 2021-01-26 18:01:55 +00:00
ponvalavan annamalai
6cd6568ee3 Dynamic color for data points 2021-01-26 17:24:31 +00:00
Vladyslav_Prykhodko
c14e2c81b1 UI: Refactoring LwM2M 2021-01-26 19:20:36 +02:00
Volodymyr Babak
712e756e58 Refactoring to simplify reading and merge 2021-01-26 19:05:37 +02:00
VoBa
ea7411348b
Merge pull request #76 from deaflynx/develop/3.3-edge 
Develop/3.3 edge Show Edge Info for customer scope, get label, fix import edges
 2021-01-26 18:57:55 +02:00
nickAS21
f770f40797 Lwm2m: front: update filter for models 2021-01-26 14:40:32 +02:00
Igor Kulikov
61723da391 Version set to 3.3.0-SNAPSHOT 2021-01-26 10:17:52 +02:00
Vladyslav_Prykhodko
ca940ba1b6 UI: Refactoring LwM2M 2021-01-25 19:54:01 +02:00
Igor Kulikov
072d0e49c3
Merge pull request #3990 from vvlladd28/bug/reset-password-required-email 
UI: Fixed email validation in form reset password
 2021-01-25 17:15:31 +02:00
Vladyslav_Prykhodko
fdfd090b0b UI: Fixed email validation in form reset password 2021-01-25 17:07:14 +02:00
nickAS21
a8e093910a Lwm2m: back&front: update filter for objectIds 2021-01-25 15:57:09 +02:00
Igor Kulikov
d9f1872c8c Device wizard: Rollback(delete) device when failed to save device credentials. 2021-01-25 13:01:13 +02:00
Volodymyr Babak
555778bf7d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2021-01-22 20:54:40 +02:00
Igor Kulikov
4e3a7ed897 Add overwriteActivityTime checkbox to device wizard. Update rule node ui. 2021-01-22 18:34:16 +02:00
Vladyslav_Prykhodko
de77c53fcc UI: Refactoring LwM2M 2021-01-22 16:14:39 +02:00
Andrii Shvaika
d06ce5555c Simplified implementation of the overwrite activity time flag 2021-01-22 16:06:48 +02:00
Andrii Shvaika
5a5f29610f Merge branch 'fix/lastActivityTime' of https://github.com/zbeacon/thingsboard into zbeacon-fix/lastActivityTime 2021-01-22 15:24:12 +02:00
nickAS21
fa8df68207 Lwm2m: front: refactoring5 2021-01-22 14:46:55 +02:00
Igor Kulikov
ddb01aac17 Minor fixes 2021-01-22 12:30:40 +02:00
Volodymyr Babak
b4800ac4c5 Fixes for import 2021-01-22 10:49:20 +02:00
Igor Kulikov
45192fc2f0
Merge pull request #3974 from lsyer/master 
Update some translations: locale.constant-zh_CN.json
 2021-01-21 18:38:14 +02:00