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

862 Commits

Author SHA1 Message Date
Volodymyr Babak
da082e2700 Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-06-20 19:22:28 +03:00
Sergey Matvienko
966b0923e7 js-script-engine-api: fixed CE merge 2021-06-17 14:12:33 +03:00
Sergey Matvienko
b397dfb518 js-script-engine-api: js sync calls replaced with completely async calls (CE API only) 2021-06-17 14:10:34 +03:00
Sergey Matvienko
8915b279a0 js-script-engine-api: executeSwitch replaced with asynchronous executeSwitchAsync 2021-06-17 13:48:11 +03:00
Sergey Matvienko
585f473bda exception message added onFailure for GeneratorNode 2021-06-17 11:14:54 +03:00
Sergey Matvienko
f4c98595cb generator node: comment added on direct executor 2021-06-17 11:07:59 +03:00
Sergey Matvienko
a3b31337ca sync method replaced with async executeGenerateAsync for ScriptEngine api. affected Generator node, ruleChainController (merged with ce) 2021-06-17 11:04:57 +03:00
Igor Kulikov
b4566a93fd Add mobile dashboard to alarm rules 2021-06-14 15:42:27 +03:00
YevhenBondarenko
e58d5b2d8a removed rpc status sent, added idx_rpc_tenant_id_device_id 2021-06-14 15:06:21 +03:00
YevhenBondarenko
6b546a459e added RPC message types 2021-06-14 10:10:43 +03:00
YevhenBondarenko
489c67778a implemented persisted RPC 2021-06-11 11:10:06 +03:00
Andrew Shvayka
ecb2efdabd
Merge pull request #4681 from YevhenBondarenko/feature/ota-limits 
created data limits for resources and otaPackages, added url for the otaPackage
 2021-06-04 09:27:47 +03:00
YevhenBondarenko
43b4f4461d created data limits for resources and otaPackages, added url for the otaPackage 2021-06-03 18:34:39 +03:00
Andrii Shvaika
04ec8489ec Merge branch 'feature/alarms-ttl' of https://github.com/ViacheslavKlimov/thingsboard 2021-06-03 16:33:27 +03:00
Volodymyr Babak
831ddc43bc Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-06-02 18:00:28 +03:00
Viacheslav Klimov
abf8ff25b5 Do not create alarm state if alarms creation is disabled 2021-06-01 12:12:35 +03:00
Viacheslav Klimov
9e1d86d7e8 Refactor 2021-05-31 15:41:16 +03:00
Volodymyr Babak
d79ab8880d Added scope to push to cloud and push to edge rule nodes configuration 2021-05-28 20:01:12 +03:00
Vladyslav_Prykhodko
8938c69e7b UI: Updated dependencies 2021-05-27 10:58:34 +03:00
AndrewVolosytnykhThingsboard
fbb8cb5985 Rest Api Call Node fixes: throws null data for next node in message, added default header Content-Type 2021-05-26 19:54:07 +03:00
Volodymyr Babak
eae41d112f Refactored 2021-05-26 19:53:07 +03:00
Volodymyr Babak
acc9257af7 Fix for org.apache.kafka.common.KafkaException: javax.security.auth.login.LoginException: unable to find LoginModule class 2021-05-26 19:53:07 +03:00
Volodymyr Babak
b0bfdfff8e Pagedata usage for get edges methods 2021-05-25 10:38:12 +03:00
Volodymyr Babak
2c826c12cd added admin setting fetcher 2021-05-20 13:05:21 +03:00
Igor Kulikov
d5b640d602 Add image fields for dashboard and device profile entities. Introduce getAllAlarms and getCustomerAlarms API 2021-05-06 17:01:46 +03:00
Andrew Volostnykh
287a0a7515 Added front 2021-05-06 16:54:30 +03:00
Andrew Volostnykh
91d33c6597 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/html-emails-copy 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/MailService.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
 2021-05-06 14:06:59 +03:00
Viacheslav Klimov
6b008e52cb Refactor 2021-04-22 13:15:19 +03:00
Viacheslav Klimov
030d80d05a CustomerId to TbMsg and SessionInfo 2021-04-22 13:15:19 +03:00
Viacheslav Klimov
f89b30777e Initial implementation for per-customer api usage stats 2021-04-22 13:15:19 +03:00
Vladyslav_Prykhodko
9900cc3d97 Updated ui rule node 2021-04-22 10:33:51 +03:00
AndrewVolosytnykhThingsboard
c7269528fa
[PROD-881] Dynamic alarm severity in Create Alarm Rule Node (#4393) 
* Dynamic alarm severity feature added

* Tests for dynamic alarm severity added

* Removed redundant imports

* Join front-end part

* Refactoring: create of method processAlarmSeverity, remove incorrect solution and process severity in correct places

* Correct updating of alarm parsed from msg data

* Removed redundant operations

* Correct exceptions throwing
 2021-04-21 15:05:45 +03:00
AndrewVolosytnykhThingsboard
2423398d41 Added missing parameter to test 2021-04-21 13:14:00 +03:00
AndrewVolosytnykhThingsboard
8281609df0 Join front-end 2021-04-21 13:05:31 +03:00
AndrewVolosytnykhThingsboard
366ac8768b Code cleaning, added ability to choose type of email body 2021-04-20 18:19:56 +03:00
AndrewVolosytnykhThingsboard
6ab586b0b1 Merging feature/html-emails from CE 2021-04-16 15:49:37 +03:00
Igor Kulikov
54ba69a82c Fix code style issues 2021-04-13 13:09:19 +03:00
Volodymyr Babak
770d3f91f2 Code review changes 2021-04-09 19:38:45 +03:00
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
Igor Kulikov
a207e31841 Merge with master 2021-04-09 12:40:43 +03:00
Igor Kulikov
4a63660e1d Version set to 3.3.0-SNAPSHOT 2021-04-09 12:37:08 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +03:00
Viacheslav Klimov
68a73caada Ignore default value for filters with constant key type 2021-03-30 18:24:00 +03:00
Igor Kulikov
e17de056c2 Merge with master 2021-03-19 12:16:43 +02:00
Viacheslav Klimov
35626766a1 Refactor 2021-03-18 18:05:56 +02:00
Viacheslav Klimov
c98a2d18a1 Refactor 2021-03-18 18:05:56 +02:00
Viacheslav Klimov
22ada62f3b Fix outdated data in alarm clear event 2021-03-18 18:05:56 +02:00
zbeacon
52d1b756fa Fix for test script node function 2021-03-17 17:04:27 +02:00
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
Viacheslav Klimov
e30ec49d2b
[3.3] [PROD-806] Implement alarm condition metadata displaying (#4185) 
* Implement alarm condition metadata displaying

* Refactor
 2021-03-15 17:09:35 +02:00