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

7013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AndrewVolostnykhThingsboard
3c558a7d2a getHighestAlarmSeverity: cleared unwanted code 2021-01-26 11:45:57 +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
AndrewVolostnykhThingsboard
a4981a869f highestAlarmSeverity fixed 2021-01-25 18:01:17 +02:00
Volodymyr Babak
ae8564110a Code clean up 2021-01-25 17:30:12 +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
Igor Kulikov
a67ea023d1
Merge pull request #3989 from YevhenBondarenko/improvements 
reset password improvements
 2021-01-25 17:15:02 +02:00
Vladyslav_Prykhodko
fdfd090b0b UI: Fixed email validation in form reset password 2021-01-25 17:07:14 +02:00
YevhenBondarenko
6a458e85b0 reset password improvements 2021-01-25 17:05:01 +02:00
nickAS21
a8e093910a Lwm2m: back&front: update filter for objectIds 2021-01-25 15:57:09 +02:00
YevhenBondarenko
4d4d189816 getPropagationEntityIds improvements 2021-01-25 13:06:11 +02:00
Igor Kulikov
d9f1872c8c Device wizard: Rollback(delete) device when failed to save device credentials. 2021-01-25 13:01:13 +02:00
nickAS21
1ed44010e4 Lwm2m: update serverKetStore.jks 2021-01-23 11:20:35 +02:00
Volodymyr Babak
8f429bee0d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2021-01-23 00:18:13 +02:00
Volodymyr Babak
97b410c4ac Fixed assign edge to customer test 2021-01-23 00:16:51 +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
Volodymyr Babak
0e7af5a649 Label fixes 2021-01-22 19:44:40 +02:00
nickAS21
317dfdbc42 Lwm2m: front&back: refactoring add on the back ObjectIdFromTextSearch for search list models with filter by ObjectId 2021-01-22 19:11:00 +02:00
Igor Kulikov
4e3a7ed897 Add overwriteActivityTime checkbox to device wizard. Update rule node ui. 2021-01-22 18:34:16 +02:00
Andrii Shvaika
90334db157 Refactoring of HTTP and MQTT client credentials 2021-01-22 17:06:53 +02:00
Vladyslav_Prykhodko
de77c53fcc UI: Refactoring LwM2M 2021-01-22 16:14:39 +02:00
Andrii Shvaika
e97c742828 Merge branch 'feature/rest_api_node_ssl' of https://github.com/vkukhtyn/thingsboard 2021-01-22 16:11:43 +02:00
Andrii Shvaika
beff831d5d git push origin masterMerge branch 'zbeacon-fix/lastActivityTime' 2021-01-22 16:07:17 +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
zbeacon
2d1f9b6158 Moved code to existing processing 2021-01-22 11:53:00 +02:00
Artem Babak
2fbdda052a
Merge pull request #2 from volodymyr-babak/import-updates 
Fixes for import
 2021-01-22 11:04:27 +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
1db24fbd52
Merge pull request #3970 from YevhenBondarenko/fix-device-state 
process ALARM_ACK msg in device state
 2021-01-21 18:36:59 +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
Volodymyr Babak
3d0aa93aaf Send notification renaming 2021-01-21 14:53:31 +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
Artem Babak
473f0c33cf
Merge pull request #1 from volodymyr-babak/import-updates 
Import updates
 2021-01-21 09:00:41 +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