1038 Commits

Author SHA1 Message Date
Andrew Shvayka
f8929de578 Adding RuleChain and RuleNode actors 2018-03-20 08:51:31 +02:00
Andrew Shvayka
00352231b1 LifeCycle Events for RuleChainActor 2018-03-15 15:17:32 +02:00
Igor Kulikov
ae45a62f2f Rule Chains UI 2018-03-14 20:43:56 +02:00
Igor Kulikov
b0eb57bba2 Add Rule Chain Controller 2018-03-14 12:42:12 +02:00
Igor Kulikov
2f89b6d0f3 Fix RuleChain DAO model 2018-03-14 12:19:33 +02:00
Igor Kulikov
10bbeef661 RuleChain service tests. 2018-03-14 11:45:22 +02:00
Andrew Shvayka
017881cbec Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-03-13 18:03:11 +02:00
Andrew Shvayka
070e5b5b62 Query refactoring and improvements 2018-03-13 18:03:00 +02:00
Igor Kulikov
4956c0c573 Rule Chain service implementation. 2018-03-13 13:12:00 +02:00
Igor Kulikov
5bfdf9decf Rule Chain Service 2018-03-13 10:46:12 +02:00
Igor Kulikov
9764f27a10 Rule Chain and Rule Node DAO. 2018-03-12 12:28:16 +02:00
Igor Kulikov
016bbefaba Merge with master 2018-03-09 18:44:07 +02:00
Andrew Shvayka
1d117297ff Fixed subscription service for empty scope 2018-03-06 16:03:40 +02:00
VoBa
862d1747be
Merge pull request #630 from volodymyr-babak/master
Fixed zk version
2018-03-06 09:57:00 +02:00
Volodymyr Babak
c9a3da7107 Fixed zk version 2018-03-06 09:55:35 +02:00
Igor Kulikov
369d090ce7 Fix license header. 2018-03-05 18:34:31 +02:00
Igor Kulikov
907b3655d7 Set UI version to 1.4.1 2018-03-05 18:21:43 +02:00
Igor Kulikov
44a51713c4 Version set to 1.4.1-SNAPSHOT 2018-03-05 18:21:08 +02:00
Igor Kulikov
468e6d8ba9 Version set to 1.4.0 2018-03-05 17:46:10 +02:00
Igor Kulikov
68122de344 Update docker version to 1.4.0 2018-03-05 17:43:49 +02:00
Igor Kulikov
8a28cd703f Update license header year to 2018. 2018-03-05 17:34:13 +02:00
Valerii Sosliuk
1b90b2b064
Merge pull request #625 from mp-loki/master
OPC-UA extension ui Application URI made optional
2018-03-03 00:06:14 -05:00
mp-loki
a593e5a9d9 OPC-UA extension ui Application URI made optional 2018-03-02 23:04:02 -05:00
Valerii Sosliuk
53fb498a60
Merge pull request #624 from mp-loki/master
client.keygen.sh script fix
2018-03-02 23:03:28 -05:00
vparomskiy
3b5a4941ff Cassandra MsqQueue initial implementation 2018-03-02 13:27:59 +02:00
Igor Kulikov
8fdc5a8a8b Fix: use time-based null UUID for public userId. 2018-03-02 10:36:22 +02:00
Igor Kulikov
9151bfde83 Fix widgets bundles upgrade. 2018-03-01 20:32:04 +02:00
Igor Kulikov
0851a2fd57
Merge pull request #616 from volodymyr-babak/feature/audit-elastic
Added elastic sink. audit log service
2018-03-01 14:26:35 +02:00
Igor Kulikov
5cf3268dc1
Merge pull request #617 from jktu2870/bugs
The previous solution took account not all variety of "base64 url"
2018-03-01 14:23:20 +02:00
Igor Kulikov
ca6ea7dd6d
Merge pull request #619 from thingsboard/feature/customer-dashboards
Feature/customer dashboards
2018-03-01 13:43:50 +02:00
Igor Kulikov
ea33ce154f Add Fallback to English language for missing translations. 2018-03-01 13:19:09 +02:00
Igor Kulikov
d6a3fff891 Fix SQL upgrade script. 2018-03-01 12:58:57 +02:00
Igor Kulikov
0021f007f1 Implement multiple customer assigned dashboards UI. Add Current Customer entity type for dashboard aliases. 2018-03-01 11:52:52 +02:00
oleg
24a4f71eda UI:Fix. "Take account if there is encoding defined inside base64" 2018-02-28 12:39:10 +02:00
Volodymyr Babak
7f1651c807 Code review fixes 2018-02-28 12:32:25 +02:00
Volodymyr Babak
12b8f77e2d Added elastic sink. audit log service 2018-02-28 09:27:12 +02:00
Volodymyr Babak
4ef97a40b8 Added elastic sink. audit log service 2018-02-28 09:21:58 +02:00
Volodymyr Babak
8d1f7040b6 Added elastic sink. audit log service 2018-02-28 09:03:06 +02:00
Igor Kulikov
7645e6f26e Fix Dashboards dump parsing 2018-02-27 19:32:36 +02:00
Igor Kulikov
9944439539 Improve CSV data dump. 2018-02-27 19:15:20 +02:00
Igor Kulikov
063a1093e0 Ability to assign dashboards to multiple customers - DAO Layer. 2018-02-27 18:30:23 +02:00
Andrew Shvayka
def29174a3 Merge branch 'master' of github.com:thingsboard/thingsboard 2018-02-27 16:35:15 +02:00
Andrew Shvayka
4f13461e89 Updated Netty Version 2018-02-27 16:34:51 +02:00
Igor Kulikov
b90f0ea07a
Merge pull request #601 from Terny22/master
company-logo in html-value-card widget
2018-02-26 19:37:10 +02:00
Igor Kulikov
ff1c4ec8fb
Merge pull request #603 from jktu2870/bugs
Fix for base64 in widget custom CSS editor
2018-02-26 19:36:22 +02:00
oleg
52578afd09 UI:Fix. "Widget custom CSS editor" it was impossible to use base64 2018-02-23 17:42:56 +02:00
Sergey Tarnavskiy
b08d3a5a25 small fix 2018-02-23 15:55:13 +02:00
Sergey Tarnavskiy
d072f86455 changed company logo in html-value-card widget 2018-02-23 13:40:23 +02:00
Igor Kulikov
39682a9e87
Merge pull request #586 from thingsboard/feature/audit_log
Feature/audit log
2018-02-22 11:33:22 +02:00
Igor Kulikov
e639dd1fe8 Fix cassandra audit log dao. 2018-02-22 11:28:24 +02:00