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

926 Commits

Author SHA1 Message Date
Andrew Shvayka
774bb96853
Merge pull request #6734 from thingsboard/refactoring_test_customer_05 
[3.4] Refactoring test customer
 2022-06-22 13:32:41 +03:00
Andrew Shvayka
db2c5dc4c5
Merge pull request #6669 from ViacheslavKlimov/fix/copy-attributes-to-view 
[3.4] Fix NPE in 'copy to view' node
 2022-06-22 13:24:51 +03:00
Andrew Shvayka
c93772273c
Merge pull request #6642 from ViacheslavKlimov/fix/device-profile-permissions-checks 
[3.4] Fix permission checks for DeviceProfileController
 2022-06-22 13:02:09 +03:00
nickAS21
439fe05a7e Merge branch 'develop/3.4' into refactoring_test_customer_05 
# Conflicts:
#	common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
 2022-06-22 11:43:01 +03:00
Andrii Shvaika
c744192d37 Merge PR #6262 2022-06-22 11:29:44 +03:00
Andrii Shvaika
6f78d8245a Merge branch 'restApiCallNodeJsonVarFix' of github.com:desoliture1/thingsboard into develop/3.4 2022-06-22 11:23:28 +03:00
nickAS21
34d6b7a035 Merge branch 'develop/3.4' into refactoring_test_customer_05 2022-06-21 19:09:23 +03:00
YevhenBondarenko
697f317e4b merget with develop/3.4 2022-06-21 07:18:11 +02:00
nickAS21
9e1cb8593f Merge branch 'develop/3.4' into refactoring_test_customer_05 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
 2022-06-21 08:05:28 +03:00
nickAS21
c7a7e487ad testActiveAlarmScheduleFromDynamicValuesWhenDefaultScheduleIsInactive - remove ignore 2022-06-20 12:26:53 +03:00
nickAS21
6d29ef415e testActiveAlarmScheduleFromDynamicValuesWhenDefaultScheduleIsInactive - to ignore 2022-06-18 21:07:04 +03:00
Andrii Shvaika
7a4fec93cd Fix re-import of rule chains, and different not related test 2022-06-18 09:28:54 +03:00
YevhenBondarenko
e61bfea55e merge with develop/3.4 2022-06-16 12:04:58 +02:00
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Andrew Shvayka
dbfd6ecfe7
Merge branch 'develop/3.4' into restApiCallNodeJsonVarFix 2022-06-14 19:13:54 +03:00
nickAS21
f36fc44afc Merge branch 'develop/3.4' into refactoring_tests_alarm_customer 2022-06-14 15:18:01 +03:00
Andrii Shvaika
4605d7e56c Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-06-13 16:21:19 +03:00
Andrii Shvaika
82763495e0 Perofrmance improvements 2022-06-13 16:21:05 +03:00
YevhenBondarenko
6351366aed fixed device profile node 2022-06-13 10:57:28 +02:00
nickAS21
0cd24bb16e refactoring: alarm - test start 2022-06-12 20:28:12 +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
Viacheslav Klimov
e190f253eb Fix NPE in 'copy to view' node 2022-06-08 17:01:04 +03:00
Vladyslav_Prykhodko
484a62b964 Updated rulenode-core-config 2022-06-02 11:40:39 +03:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
Viacheslav Klimov
985f7c79aa 2FA refactoring 2022-05-27 12:34:12 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
YevhenBondarenko
fa4a20d711 Added resolve by queue name for backward compatibility 2022-05-19 10:04:51 +02:00
YevhenBondarenko
abe127c3fa fixed checkpoint node 2022-05-19 01:18:13 +02:00
Viacheslav Klimov
866ad82187 Email 2FA verification message improvements 2022-05-18 12:50:12 +03:00
Viacheslav Klimov
41fede9b43 Add checks for SMS and mail service when setting up 2FA provider; 2Fa verification mail template 2022-05-17 18:31:49 +03:00
YevhenBondarenko
b037fb09b0 merge with develop/3.4 2022-05-16 12:59:19 +02:00
YevhenBondarenko
321730ed02 added upgrade for queues 2022-05-11 23:02:03 +02:00
fe-dev
bdf1807223 UI: Update rulenode core 2022-05-11 14:20:37 +03:00
Viacheslav Klimov
a5236e7547 Tests for DeviceState 2022-05-10 11:07:45 +03:00
YevhenBondarenko
dc3c2cfec2 merge with develop/3.4 2022-05-09 22:27:21 +02:00
Viacheslav Klimov
a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2022-05-06 11:42:10 +03:00
Viacheslav Klimov
4480badd78 Email 2FA provider; 2FA API improvements 2022-05-05 18:08:54 +03:00
Viacheslav Klimov
3098b2925a Fix NPE when handling alarm delete notification for cleared alarm 2022-05-04 11:47:41 +03:00
Viacheslav Klimov
b619ffa6b7 Fix: all alarm rules are reevaluated when any attribute is deleted 2022-05-04 11:46:09 +03:00
Andrii Shvaika
15104028ea Investigating the cache issues 2022-04-29 16:12:22 +03:00
Sergey Matvienko
ca8df0130f TbLogNode.java standard implementation without calling JS when JsScript equals default config 2022-04-26 15:26:31 +03:00
Volodymyr Babak
878d9743ce Organize imports 2022-04-20 18:11:29 +03:00
Volodymyr Babak
f8687cb983 Make save edge event method async 2022-04-20 17:17:46 +03:00
Andrew Shvayka
65be4cd16c
Merge pull request #6437 from volodymyr-babak/fix-push-to-edge-node 
[3.4] Fixes for bug - push to edge node generates timeout message
 2022-04-20 14:08:09 +03:00
Andrii Shvaika
9dacc93c2d Merge remote-tracking branch 'origin/master' into develop/3.4 2022-04-20 11:49:21 +03:00
YevhenBondarenko
75e2b60eb8 Implemented isolated rule engine queue consumers 2022-04-19 23:02:33 +02:00
Volodymyr Babak
5b4e92974d Use getMetadataTs method instead of direct fetch from metadata 2022-04-19 10:21:26 +03:00
Volodymyr Babak
978861e56c Minor refactoring. Added missing timeseries_updated message type 2022-04-18 11:52:23 +03:00
Volodymyr Babak
ef4adbda7b Ack messages in case no edges are related. Refactored push to cloud/edge nodes 2022-04-18 11:52:14 +03:00
YevhenBondarenko
4e4ac0012c used queueId instead of queueName in DeviceProfile and TbMsg 2022-04-13 21:55:03 +02:00