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

11858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
aac93c1818 UI: Provide parent dashboard in embedded dashboard dialog. 2022-11-03 15:15:37 +02:00
Andrii Shvaika
a8d4c02e7c Merge branch 'feature/check_tenant_entity_for_nodes' of github.com:YuriyLytvynchuk/thingsboard 2022-11-03 15:07:10 +02:00
Andrew Shvayka
bad7abac42
Merge pull request #7538 from smatvienko-tb/alarm-service-optimization 
[3.4.2] Alarm service optimization - remove async().get() calls from synchronous methods
 2022-11-03 14:27:33 +02:00
Igor Kulikov
da6297dfe2
Merge pull request #7537 from vvlladd28/engix-ltd-drag_drop_actions_in_list 
[3.4.2] UI: Let user to drag-n-drop widget actions in list.
 2022-11-03 14:27:14 +02:00
Yuriy Lytvynchuk
b5f11f1bd0 Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-03 14:10:48 +02:00
Yuriy Lytvynchuk
8b9eb43322 refactor code 2022-11-03 14:06:42 +02:00
Vladyslav_Prykhodko
2f16c1a1fe UI: Fixed calculate action index in other page 2022-11-03 14:06:10 +02:00
Sergey Matvienko
11781bb601 alarm service optimization - remove async().get() calls from synchronous methods 2022-11-03 13:18:21 +02:00
Vladyslav_Prykhodko
896f07218b UI: Improvement widget drag and drop actions function 2022-11-03 12:36:17 +02:00
Yurii
7be1cc74a4
Merge pull request #9 from ShvaykaD/feature/node_originator_attributes_fetch_to_msg_data 
added JacksonUtilTest for ALLOW_UNQUOTED_FIELD_NAMES_MAPPER and updat…
 2022-11-03 12:34:53 +02:00
ShvaykaD
e94d305f61 added JacksonUtilTest for ALLOW_UNQUOTED_FIELD_NAMES_MAPPER and updated getAttributes tests 2022-11-03 12:31:31 +02:00
Vladyslav_Prykhodko
7213207130 Merge remote-tracking branch 'upstream/master' into engix-ltd-drag_drop_actions_in_list 2022-11-03 11:52:05 +02:00
Igor Kulikov
b65aa4cc8a Add special command to warm up MVEL engine 2022-11-03 11:18:30 +02:00
Igor Kulikov
323a47a744 Improve logging of TbMsgGeneratorNode 2022-11-03 10:34:45 +02:00
Igor Kulikov
b96d3d02ac UI: Fixed flatDataWithoutOverride - create empty object when data array is empty. 2022-11-03 09:47:02 +02:00
Vladyslav_Prykhodko
09639b42d2 Merge remote-tracking branch 'upstream/master' into engix-ltd-phone_delimeters 2022-11-02 17:27:43 +02:00
Vladyslav_Prykhodko
98cad2d140 UI: Refactoring code 2022-11-02 17:23:33 +02:00
Vladyslav_Prykhodko
8271b0534b UI: Clear code and change style 2022-11-02 16:55:33 +02:00
Igor Kulikov
e03994c2ea
Merge pull request #7531 from thingsboard/engix-ltd-threshold_array 
[3.4.2] UI: Chart thresholds support array of values
 2022-11-02 15:38:29 +02:00
Igor Kulikov
d61b38fc8d
Update flot-widget.ts 2022-11-02 15:34:45 +02:00
Yuriy Lytvynchuk
15683504fd refactor & update logic 2022-11-02 15:22:33 +02:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
Igor Kulikov
3066192901
Merge pull request #7526 from vvlladd28/improvement/data-key/style 
[3.4.2] UI: Minor style fixes in data key config
 2022-11-02 15:00:36 +02:00
Igor Kulikov
bbc74d98dd
Merge pull request #7365 from kalutkaz/fixMarkdownWidget 
[3.4.2] UI: Fix markdown widget
 2022-11-02 14:57:09 +02:00
Andrew Shvayka
13996b6ce8
Merge pull request #7519 from smatvienko-tb/mqtt-transport-log-shorter-on-io-exception 
[3.4.2] MQTT transport: Make log shorter on IOException
 2022-11-02 14:08:26 +02:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
Andrew Shvayka
01f6adf7d5
Merge pull request #7525 from ViacheslavKlimov/fix/audit-logs-migration-script 
[3.4.2] Fix audit logs migration script
 2022-11-02 13:20:39 +02:00
ShvaykaD
fea91220f0 fix error in merge with master 2022-11-02 12:55:03 +02:00
Igor Kulikov
e581bc3af8
Merge pull request #7530 from smatvienko-tb/cassandra-all_3_11_14_fix 
[3.4.2] cassandra-all 3.11.14 have no dependency on cassandra-thrift. added f…
 2022-11-02 12:33:33 +02:00
Igor Kulikov
e0da034004 Revert fix cassandra-all dependency 2022-11-02 12:32:14 +02:00
Igor Kulikov
4ca41efe2a Fix cassandra-all dependency 2022-11-02 12:25:16 +02:00
Sergey Matvienko
e82fc6d533 cassandra-all 3.11.14 have no dependency on cassandra-thrift. added for dao test scope and tools package along with cassandra-all 2022-11-02 12:11:57 +02:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
Kalutka Zhenya
de0a196d7a Refactoring 2022-11-02 11:58:33 +02:00
Yurii
2c3b9b9f71
Merge pull request #8 from ShvaykaD/feature/node_originator_attributes_fetch_to_msg_data 
added ALLOW_UNQUOTED_FIELD_NAMES_MAPPER to JacksonUtil
 2022-11-02 11:54:15 +02:00
ShvaykaD
41a5f8d9e4 fix license for JacksonUtil 2022-11-02 11:49:05 +02:00
ShvaykaD
02ca2b0235 added ALLOW_UNQUOTED_FIELD_NAMES_MAPPER to JacksonUtil 2022-11-02 11:44:46 +02:00
Kalutka Zhenya
c6dff4145b Update logic for markdown and QR code widgets 2022-11-02 11:32:53 +02:00
oyurov
215a44b7c7 Added tests 2022-11-02 09:19:51 +01:00
Vladyslav_Prykhodko
4d12e4a1e7 UI: Improvement parse threshold data 2022-11-02 10:16:25 +02:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
Sergey Matvienko
a08c716ad2 upgrade for JwtSetting targeted from 3.4.1 to 3.4.2 2022-11-01 20:11:41 +02:00
Sergey Matvienko
db3ca06f4d Merge remote-tracking branch 'ce/master' into jwt-random 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AdminController.java
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
 2022-11-01 20:05:50 +02:00
Sergey Matvienko
ea80f9838e JwtSettings API added to the admin controller 2022-11-01 20:04:37 +02:00
Artem Babak
21a6ed6be7 Data key config style update 
- Settings tab. Aggregation section: fixed mat-expansion-panel height
 2022-11-01 18:15:54 +02:00
ViacheslavKlimov
386c664025 Fix audit logs migration procedure 2022-11-01 17:57:34 +02:00
Yuriy Lytvynchuk
1d77a1c027 add JsonParseException 2022-11-01 17:03:01 +02:00
Andrii Shvaika
c10e491de7 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-11-01 16:56:55 +02:00
Andrii Shvaika
08b226c18f Bump Cassandra versions 2022-11-01 16:56:47 +02:00
Sergey Matvienko
25bb031846 mqtt handler shows short logs on info level and stacktrace on debug level. DeviceId will also print in the logs 2022-11-01 16:56:17 +02:00