534 Commits

Author SHA1 Message Date
Volodymyr Babak
9f79f83d83 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-07 11:36:20 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Volodymyr Babak
ed85d3de3e Refactored RPC request 2020-12-01 18:58:58 +02:00
Andrii Shvaika
87a8cec7b5 Version set to 3.2.1-SNAPSHOT 2020-12-01 18:05:47 +02:00
Andrii Shvaika
a87956ebfd Improvements to Storage Days calculation 2020-11-28 16:38:28 +02:00
Andrii Shvaika
4e8b0aa674 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-28 15:05:21 +02:00
Andrii Shvaika
458beede1a Default Storage TTL in Days 2020-11-28 15:05:11 +02:00
YevhenBondarenko
8f8814d167 moved sms configs to common package, rest client improvements 2020-11-27 12:03:22 +02:00
YevhenBondarenko
8515b6d6e0 alarm rules improvements 2020-11-25 18:19:33 +02:00
Andrii Shvaika
254905c2b3 Minor improvements 2020-11-25 12:53:33 +02:00
Andrii Shvaika
eb8975d504 SMS Email Limits 2020-11-20 18:02:09 +02:00
Igor Kulikov
ffdf56222e Add send sms rule node config ui 2020-11-20 14:58:24 +02:00
Igor Kulikov
1e1e3ec6a3 Introduce SMS Service. Add Send SMS Rule Node 2020-11-20 13:08:20 +02:00
Volodymyr Babak
3bdb7bb5ad SERVER_SCOPE by default, if not provided in metadata 2020-11-19 17:26:07 +02:00
Volodymyr Babak
fe53158b82 Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-19 15:54:39 +02:00
Andrii Shvaika
0fff851210 Alarm Query fix for propagated alarms with entities assigned to customer 2020-11-19 11:26:51 +02:00
YevhenBondarenko
076f548358 refactored AlarmState 2020-11-16 13:07:58 +02:00
YevhenBondarenko
150b1bb809 AlarmState improvements (used createDetails for update or clear alarm). 2020-11-16 13:07:58 +02:00
YevhenBondarenko
0f662a679c Merge with develop/2.5.5 2020-11-13 12:02:13 +02:00
Andrii Shvaika
dc25e0dd3c Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-12 19:32:51 +02:00
Andrii Shvaika
cb41548b22 Add cleanup of clear alarm state on non matching condition 2020-11-12 19:32:45 +02:00
YevhenBondarenko
72a0126e23 AlarmState improvements 2020-11-12 17:07:07 +02:00
YevhenBondarenko
eece6418c3 updated versions 2020-11-12 13:22:32 +02:00
YevhenBondarenko
a2eea121be AlarmState improvements 2020-11-11 11:20:26 +02:00
YevhenBondarenko
55b8ae92ea refactored 2020-11-11 11:20:26 +02:00
YevhenBondarenko
1daf5a44b5 alarm state improvements (added details to alarm from device profile details pattern) 2020-11-11 11:20:26 +02:00
Volodymyr Babak
c5e33e48f0 Set SERVER_SCOPE by default if not provided 2020-11-10 17:44:44 +02:00
Volodymyr Babak
3cc0c5baf0 Set version to 3.3.0-SNAPSHOT 2020-11-10 16:43:28 +02:00
Volodymyr Babak
905273ea3d Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-10 16:10:48 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
Andrew Shvayka
a99a8e458c Revert "alarm state improvements (added details to alarm from device profile details pattern)"
This reverts commit ecf530c63ebc489e01b1857bc0ba55875078c10a.
2020-11-04 18:02:53 +02:00
Andrew Shvayka
1c4ab0e711 Revert "refactored"
This reverts commit da8a03e98efb359ba40556ab22d9c29c40005207.
2020-11-04 18:02:53 +02:00
YevhenBondarenko
da8a03e98e refactored 2020-11-04 18:01:01 +02:00
YevhenBondarenko
ecf530c63e alarm state improvements (added details to alarm from device profile details pattern) 2020-11-04 18:01:01 +02:00
Andrii Shvaika
a64c4e3e20 DeviceProfileNode fix for conditions based on the attributes 2020-11-03 13:05:31 +02:00
Vladyslav_Prykhodko
e095bd379f UI: Added trim value for created device, improvement created default rule chain and view queue-type-list 2020-11-03 11:05:14 +02:00
Andrii Shvaika
78ac876103 Bug fixes for Device Profile node 2020-10-29 13:26:15 +02:00
Andrii Shvaika
feb9120050 Improvements to Device Profile Rule Node 2020-10-28 19:02:56 +02:00
nordmif
94addec69d added user to the create relation rule node 2020-10-28 17:22:11 +02:00
ShvaykaD
a5edc30934 fix typo 2020-10-27 18:22:20 +02:00
ShvaykaD
d042707441 cherry-pick from 2.5.5 2020-10-27 18:22:20 +02:00
ShvaykaD
41796a4d89 fix AlarmNodeTests 2020-10-27 18:22:20 +02:00
ShvaykaD
67e8bf8c2f push ENTITY_UPDATED events on ALARM updates,clears 2020-10-27 18:22:20 +02:00
ShvaykaD
606ae2e534 fix typo 2020-10-27 18:21:50 +02:00
ShvaykaD
b78d9ca189 fix AlarmNodeTests 2020-10-27 18:21:50 +02:00
ShvaykaD
702a091329 fix/AlarmActionEvents 2020-10-27 18:21:50 +02:00
Volodymyr Babak
b5b867ad41 Added ATTRIBUTES_DELETED action and service test 2020-10-22 16:00:55 +03:00
Volodymyr Babak
d825a2a6be Code review changes 2020-10-20 12:12:54 +03:00
Volodymyr Babak
055a91fca1 EdgeEventActionType introduced 2020-10-20 11:36:28 +03:00
Volodymyr Babak
7af1c86e17 Merge branch 'develop/2.5.5' into feature/edge 2020-10-18 15:33:45 +03:00