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

899 Commits

Author SHA1 Message Date
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
Andrew Volostnykh
d1da849061 Correction of tests for DeviceProfile 2021-03-15 17:06:36 +02:00
Illia Barkov
593f63818e
Added support for RSA encrypted keys in PEM client credentials (#4230) 
* Added support for RSA encrypted keys in PEM client credentials

* Refactoring

* Refactoring
 2021-03-15 11:40:23 +02:00
Igor Kulikov
b850e7fb25
Merge pull request #4219 from volodymyr-babak/fix-error-msg 
Fixed msg in case unexpected originator type
 2021-03-10 18:21:43 +02:00
Volodymyr Babak
ec6e2611cb Fixed msg in case unexpected originator type 2021-03-10 12:01:58 +02:00
Andrii Shvaika
46f742441f Alarm State improvement 2021-03-09 12:25:56 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
Alexander Yurov
ae2ca8af08 Removed unused import 2021-03-03 15:12:59 +02:00
Alexander Yurov
f9d1e34798 Added USER as originator for 'customer details' rule node 2021-03-03 15:12:59 +02:00
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Igor Kulikov
debf1e0375 Update rule nodes config ui 2021-03-03 11:13:44 +02:00
Andrii Shvaika
f8d1fff4cc New Alias 2021-03-02 12:06:50 +02:00