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

1888 Commits

Author SHA1 Message Date
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
Igor Kulikov
9346b7fdee
Merge pull request #3972 from vvlladd28/improvement/trip-animation/change-speed 
UI: Fixed bug trip animation widget after change speed or change time to the time slider
 2021-01-21 18:36:12 +02:00
Vladyslav_Prykhodko
15abe85b74 UI: Refactoring LwM2M 2021-01-21 18:21:55 +02:00
Igor Kulikov
9b8cf75c1a UI: Refactor dashboard page. Add ability to open dashboard state in separate dialog. 2021-01-21 18:03:36 +02:00
nickAS21
573837c4b1 Lwm2m: front: refactoring sort json and add instances 2021-01-21 17:38:45 +02:00
Artem Babak
cd59a8d9c6 Import edge fix 2021-01-21 15:40:54 +02:00
Artem Babak
5ef3abb077 Merged develop/3.3-edge with volodymyr-babak/develop/3.3 2021-01-21 15:12:36 +02:00
Artem Babak
ea9f149168 Edge widget updates 2021-01-21 13:31:48 +02:00
Artem Babak
90802fa676 Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2021-01-21 09:01:19 +02:00
lsyer
03b5ca3571 Update some translations: locale.constant-zh_CN.json 2021-01-21 11:05:27 +08:00
Vladyslav_Prykhodko
758ce9f03e UI: Fixed bug trip animation widget after change speed or change time to the time slider 2021-01-20 19:19:47 +02:00
nickAS21
e6d4e91e25 Lwm2m: front: refactoring n number validators 2021-01-20 19:17:13 +02:00
Volodymyr Babak
898e5c67bf Import fixes 2021-01-20 17:43:04 +02:00
Volodymyr Babak
4aa0b02467 Code review updates 2021-01-20 17:40:35 +02:00
Vladyslav_Prykhodko
e6a3ee2725 UI: Refactoring lwm2m 2021-01-20 16:19:58 +02:00
nickAS21
6cfc792156 Lwm2m: front: refactoring <mat-expansion-panel-header> 2021-01-20 09:12:05 +02:00
lsyer
111949d4d9 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-20 09:54:25 +08:00
Vladyslav_Prykhodko
c8814f7cfa UI: Refactoring lwm2m 2021-01-19 19:36:57 +02:00
nickAS21
cfa9a5778a Lwm2m: front: refactoring 2021-01-19 16:24:58 +02:00
Chantsova Ekaterina
dac700d4fe Add ImportExport service to Services Map 2021-01-18 14:06:35 +02:00
deaflynx
24ad822443 Merge with volodymy-babak updates 2021-01-18 12:51:52 +02:00
lsyer
0f24e00fea Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-17 14:58:07 +08:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
zbeacon
1bdd7d69bf Fix for lastActivityTime in devices created by gateway 2021-01-15 18:55:35 +02:00
Volodymyr Babak
57bf6c0903 Code review updates 2021-01-15 17:56:41 +02:00
Vladyslav
cd6a76de86
Improvement/lwm2m/refactoring 1 (#3956) 
UI: Refactoring lwm2m
 2021-01-15 13:06:39 +02:00
Igor Kulikov
cff36668ed
Merge pull request #3940 from kalutkaz/fixMapPolygon 
[3.2.1] Fix map polygon
 2021-01-15 12:19:38 +02:00
Artem Babak
c90eb8bb63 ES,DE,FR locale update for Edge 2021-01-15 06:02:34 +02:00
Artem Babak
51bc0a2f17 US locale update 2021-01-15 05:29:42 +02:00
Kalutka Zhenya
7f8c3ad0b3 Refactoring 2021-01-14 19:28:56 +02:00
Kalutka Zhenya
ac0a3fdf5c update logics 2021-01-14 19:21:56 +02:00
Kalutka Zhenya
93155fb19d Update script for maps 2021-01-14 17:48:12 +02:00
Volodymyr Babak
dd879efad6 Updated enum to be uppercase. Use RuleChainType in the rule chain service 2021-01-14 16:09:07 +02:00