1333 Commits

Author SHA1 Message Date
Igor Kulikov
fbfac3e6b2 Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-04-12 14:13:25 +03:00
Igor Kulikov
5cb21afe63 Rule chain UI: FF fixes 2018-04-12 14:13:03 +03:00
vparomskiy
b3bed03d14 Merge remote-tracking branch 'origin/develop/1.5' into develop/1.5 2018-04-12 10:58:05 +03:00
vparomskiy
305005490f move exception to api
move MailService to RuleEngine
implement MsgToEmil Transformer and SendEmail Node
2018-04-12 10:57:48 +03:00
Igor Kulikov
8e3989c9a1 Improve Rule Chain UI edit. 2018-04-12 10:50:40 +03:00
Igor Kulikov
b13d666f1b Rule Chain UI: Copy/Paste support. 2018-04-11 22:12:52 +03:00
vparomskiy
737f2cc92a add Log and Alarm nodes 2018-04-11 16:19:14 +03:00
DK
4545f3b356 Merge branch 'master' of https://github.com/thingsboard/thingsboard into modbus-gui-conf 2018-04-11 15:32:34 +05:00
DK
cfcd71adb3 Implemented GUI configuration for MODBUS gateway extension. 2018-04-11 15:32:13 +05:00
Valerii Sosliuk
fa53649366
Merge pull request #709 from mp-loki/master
OPC-UA Extension fix for security type "None"
2018-04-10 21:03:34 -04:00
mp-loki
1c09299b7a OPC-UA Extension fix for security type "None" 2018-04-08 19:27:53 -04:00
Igor Kulikov
cac34a0a1a Rule Chain UI: Context menu support. 2018-04-06 23:01:26 +03:00
Igor Kulikov
6782d11931 Rule Chain UI: Context menu support. 2018-04-06 22:56:41 +03:00
Igor Kulikov
4eb08a6490 Rule Chain UI: Context menu support. 2018-04-06 22:03:15 +03:00
Igor Kulikov
c2b353f47e Test rule node script functions. 2018-04-05 20:57:09 +03:00
Igor Kulikov
b7cd24c693 Refactor script engine resources. 2018-04-05 15:07:48 +03:00
Igor Kulikov
36e45c7630 Separate js engine context for each instance. 2018-04-05 12:43:17 +03:00
Igor Kulikov
ecf54464a8 Update rule node ctx on update 2018-04-04 21:36:37 +03:00
Igor Kulikov
5b03e45fcb Relations cache fix. 2018-04-04 20:22:39 +03:00
Igor Kulikov
024dd99cb7 Refactor JS Executor. 2018-04-04 11:41:51 +03:00
Igor Kulikov
dc41e63091 Add executor to Access Validator 2018-04-03 15:11:41 +03:00
Igor Kulikov
a2d56c2e45 Merge branch 'master' into develop/1.5 2018-04-03 14:53:28 +03:00
Igor Kulikov
a6661147be Update cassandra driver ver. to 3.0.7 2018-04-03 14:52:37 +03:00
Igor Kulikov
fb934f868f Fix license headers 2018-04-03 12:20:53 +03:00
Igor Kulikov
4024e42324 Action Rule nodes config UI 2018-04-03 12:18:45 +03:00
Andrew Shvayka
b38a7d7bda Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-04-03 08:13:29 +03:00
Andrew Shvayka
0fb9f21e78 Telmetry plugin removed 2018-04-02 21:09:34 +03:00
Igor Kulikov
76dd0a4542 Transformation Rule nodes config UI 2018-04-02 20:37:26 +03:00
Igor Kulikov
c9717f4d1d Enrichment Rule nodes config UI 2018-04-02 20:07:20 +03:00
Igor Kulikov
9c0f6e9925 RuleChain Import/Export 2018-04-02 15:45:48 +03:00
Andrew Shvayka
6d8cb480e9 Fixed compilation issues 2018-04-01 20:06:41 +03:00
Andrew Shvayka
5e2667d3de Implementation of Ts Websocket Service 2018-04-01 00:20:05 +03:00
Andrew Shvayka
b16a02d97f Merge branch 'develop/1.5' into develop/1.5-no-more-plugins 2018-03-31 15:41:10 +03:00
Igor Kulikov
dc47727cf5 UI: Improve Rule Chain Editor 2018-03-30 21:24:58 +03:00
Andrew Shvayka
39f682ce9f Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-03-30 18:14:10 +03:00
Andrew Shvayka
14f8e58df0 Implementation of Generator node and improvements 2018-03-30 18:13:54 +03:00
Igor Kulikov
70d9d7addd RuleChain UI 2018-03-30 18:06:59 +03:00
Andrew Shvayka
5aac13b527 Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-03-30 15:45:13 +03:00
Andrew Shvayka
6823b8969f Refactoring of Telemetry Websockets 2018-03-30 15:44:54 +03:00
Igor Kulikov
3bcd596ed7 Details sidenav backdrop support 2018-03-30 11:10:06 +03:00
Igor Kulikov
4bbcffdf63 Rule Node Debug UI 2018-03-29 20:25:47 +03:00
Igor Kulikov
784de0836f Filter nodes UI configuration. 2018-03-29 10:57:28 +03:00
Igor Kulikov
fd1199ee1c RuleNode Config UI 2018-03-28 11:03:11 +03:00
Igor Kulikov
5749fbf88b Merge with master 2018-03-27 18:04:04 +03:00
Andrew Shvayka
2f6995fced
Fix for UI build. 2018-03-27 16:59:41 +03:00
vparomskiy
54b272c04f return permit if request expired/canceled 2018-03-27 13:16:48 +03:00
Andrew Shvayka
bb0533c528 Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-03-26 16:58:36 +03:00
Andrew Shvayka
a1662d6642 Impl 2018-03-26 16:58:14 +03:00
Igor Kulikov
b578402f11 Rule chain edit improvements. 2018-03-26 16:00:25 +03:00
Igor Kulikov
164dbd68b7 Merge branch 'develop/1.5' of github.com:thingsboard/thingsboard into develop/1.5 2018-03-23 20:59:39 +02:00