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

936 Commits

Author SHA1 Message Date
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +03:00
Vladyslav_Prykhodko
a411d9c8a3 Merge remote-tracking branch 'upstream/bug/queue-id-to-name' into bug/queue-id-to-name 2022-07-12 13:02:06 +03:00
Vladyslav_Prykhodko
5e498bab5d Change ui rule node 2022-07-12 13:00:47 +03:00
Andrii Shvaika
cd633c72c8 No more Queue Id in the Device Profile 2022-07-12 12:56:40 +03:00
Andrii Shvaika
488e05ac6c Queue ID and Queue Name 2022-07-11 18:51:38 +03:00
Andrii Shvaika
a2c84e551b Merge branch 'mail-server-timeout-impl' of github.com:desoliture1/thingsboard into develop/3.4 2022-07-08 17:16:01 +03:00
Igor Kulikov
ec0059f0a6 Fix test 2022-07-07 11:49:46 +03:00
Sergey Matvienko
8e8dfdf581 js transform node in rule engine: DbCallbackExecutor replaced with directExecutor 2022-07-06 19:08:58 +03:00
ivankozka
33b502e156 add timeoutExecutor to prevent deadlocks; fix not using timeout from configuration in TbSendEmailNode 2022-07-06 13:32:30 +03:00
Igor Kulikov
a83f99cfd9 Revert redudant logging in TbAbstractGetAttributesNode. 2022-06-24 17:27:16 +03:00
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