vparomskiy
|
b6b585b43e
|
Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0
|
2018-05-25 20:36:29 +03:00 |
|
vparomskiy
|
6d158986aa
|
change RPC nodes description
|
2018-05-25 20:36:22 +03:00 |
|
Igor Kulikov
|
0ea054c6ae
|
Help links improvements
|
2018-05-25 16:27:43 +03:00 |
|
Igor Kulikov
|
9a3df6285b
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-25 16:00:29 +03:00 |
|
Igor Kulikov
|
e556b48372
|
Fix css. Add docUrl to rule node definition.
|
2018-05-25 16:00:10 +03:00 |
|
vparomskiy
|
1e5488ec7c
|
Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0
|
2018-05-25 12:41:30 +03:00 |
|
vparomskiy
|
b647e5ffd5
|
disable Debug mode for default Root Rule Chain
|
2018-05-25 12:41:23 +03:00 |
|
Igor Kulikov
|
7c1017236f
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-25 12:18:44 +03:00 |
|
Igor Kulikov
|
e5720e883e
|
Cleanup
|
2018-05-25 12:18:31 +03:00 |
|
vparomskiy
|
f83d3016d6
|
node debug messages saved in async way
|
2018-05-25 11:51:08 +03:00 |
|
Igor Kulikov
|
90e4ff6125
|
Fixed tests.
|
2018-05-24 20:46:45 +03:00 |
|
Igor Kulikov
|
20df02ed08
|
Move common rule engine utils to API module.
|
2018-05-24 20:27:29 +03:00 |
|
Igor Kulikov
|
76a8157387
|
Improve link dragging behaviour
|
2018-05-24 20:03:39 +03:00 |
|
Igor Kulikov
|
a2dceb93a6
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-24 14:33:24 +03:00 |
|
Igor Kulikov
|
0e6c6af2f8
|
Fixed upgrade script.
|
2018-05-24 14:33:10 +03:00 |
|
vparomskiy
|
c0c7128405
|
Merge branch 'develop/2.0' of https://github.com/thingsboard/thingsboard into develop/2.0
|
2018-05-24 13:14:31 +03:00 |
|
vparomskiy
|
76e852bff0
|
use separate dbPool for async DB Tasks
|
2018-05-24 13:13:56 +03:00 |
|
Igor Kulikov
|
02e2c14fc9
|
Cleanup
|
2018-05-24 10:18:06 +03:00 |
|
Igor Kulikov
|
d1552a13b4
|
Move update scripts to ver.2.0.0
|
2018-05-24 10:04:05 +03:00 |
|
Igor Kulikov
|
f19b2efb89
|
Merge branch 'master' into develop/2.0
|
2018-05-23 17:24:45 +03:00 |
|
Igor Kulikov
|
d94ae25b4e
|
Fix license header
|
2018-05-23 17:22:34 +03:00 |
|
Igor Kulikov
|
94db399367
|
New system parameters: default cassandra ts key/val ttl; allow system mail service for rules.
|
2018-05-23 17:06:51 +03:00 |
|
Andrew Shvayka
|
55127ae61c
|
Fixed integration tests
|
2018-05-23 14:30:32 +03:00 |
|
Andrew Shvayka
|
07e3014151
|
Merge pull request #798 from jacklicn/patch-2
Add Chinese translation for audit-log.
|
2018-05-23 01:19:07 +03:00 |
|
Igor Kulikov
|
e90a708185
|
Update Rule Nodes help links.
|
2018-05-21 19:58:25 +03:00 |
|
Igor Kulikov
|
9995f8392c
|
Originator Type Switch Node. New Entity lifecycle message types.
|
2018-05-21 19:45:11 +03:00 |
|
Igor Kulikov
|
f24aa3c284
|
Fix spelling
|
2018-05-21 17:41:13 +03:00 |
|
Igor Kulikov
|
0cb263b564
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-21 17:37:49 +03:00 |
|
Igor Kulikov
|
992c6e066e
|
UI: Update rule nodes config.
|
2018-05-21 17:37:36 +03:00 |
|
vparomskiy
|
53f84b625b
|
Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0
# Conflicts:
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
|
2018-05-21 16:32:27 +03:00 |
|
vparomskiy
|
88c9b474a0
|
update external Nodes description
|
2018-05-21 16:31:03 +03:00 |
|
Igor Kulikov
|
4230262960
|
Add rule node help links. Improve rule nodes description.
|
2018-05-21 11:47:48 +03:00 |
|
jacklicn
|
4591d16844
|
Add Chinese translation for audit-log.
|
2018-05-21 12:42:36 +08:00 |
|
Andrew Shvayka
|
6cf7b35b86
|
Merge pull request #792 from GreatGarlic/master
MqttTransportService NioEventLoopGroup shutdown order error
|
2018-05-20 22:41:24 +03:00 |
|
Andrew Shvayka
|
41ae9fc7b0
|
Merge pull request #783 from jacklicn/patch-5
Add missed import statements!
|
2018-05-20 22:40:16 +03:00 |
|
Andrew Shvayka
|
e0b6c3238c
|
Added Failure relation to be present by default for each node. Forwarding Errors to Failure
|
2018-05-20 22:39:27 +03:00 |
|
Igor Kulikov
|
606d21ab79
|
Rule Chain UI improvements.
|
2018-05-18 21:22:31 +03:00 |
|
Igor Kulikov
|
ee291b9b05
|
Add RuleChain case for fetchEntityNameAsync
|
2018-05-18 20:07:04 +03:00 |
|
Igor Kulikov
|
efbc65e11f
|
Enable/Disable Sandboxed JavaScript environment. UI: Tidy button to format java scripts.
|
2018-05-18 19:41:02 +03:00 |
|
Igor Kulikov
|
af5791ab7a
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-18 16:55:35 +03:00 |
|
Igor Kulikov
|
f73fbc5ee9
|
JavaScript Sandbox Service improvements.
|
2018-05-18 16:55:26 +03:00 |
|
Andrew Shvayka
|
8bdde06fa2
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-18 15:03:42 +03:00 |
|
Andrew Shvayka
|
ffb8a1a53b
|
Update script improvements
|
2018-05-18 15:03:31 +03:00 |
|
Igor Kulikov
|
04432ee73f
|
JavaScript sandbox service.
|
2018-05-17 19:21:34 +03:00 |
|
Andrew Shvayka
|
02f24ca672
|
Merged with main branch and fixed tests
|
2018-05-17 14:51:35 +03:00 |
|
Andrew Shvayka
|
db4e1289c9
|
No more rules and plugins
|
2018-05-17 14:03:05 +03:00 |
|
Igor Kulikov
|
89ffda9a78
|
Merge branch 'develop/2.0' of github.com:thingsboard/thingsboard into develop/2.0
|
2018-05-17 13:45:20 +03:00 |
|
Igor Kulikov
|
9175aba24f
|
Improve Relation Service
|
2018-05-17 13:45:06 +03:00 |
|
liuyuan
|
96a77fc2ea
|
MqttTransportService NioEventLoopGroup shutdown order error
|
2018-05-17 18:27:26 +08:00 |
|
GreatGarlic
|
15f53ee899
|
Merge pull request #1 from thingsboard/master
pull latest
|
2018-05-17 18:20:33 +08:00 |
|