3520 Commits

Author SHA1 Message Date
Volodymyr Babak
1de29d7b51 Remove unused code 2020-08-28 15:27:43 +03:00
Volodymyr Babak
c991ab96f1 Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-08-28 14:25:05 +03:00
Volodymyr Babak
9c8ceaa37e Properly handle entities assign/unassign to/from customer 2020-08-28 14:14:07 +03:00
VoBa
82e4968d90
Merge pull request #42 from deaflynx/feature/edge
Added manage customer edges
2020-08-27 11:11:43 +03:00
deaflynx
aeaf2ed6c6 Added manage customer edges 2020-08-27 11:05:13 +03:00
VoBa
cf5f1cffda
Merge pull request #41 from deaflynx/feature/edge
Fix for fetch edge rule chains and deleted unused code
2020-08-27 10:17:44 +03:00
deaflynx
4ac8c0675b Fixed fetch edge rule chains 2020-08-27 08:46:32 +03:00
deaflynx
5d8378290a Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-08-27 07:05:02 +03:00
VoBa
bdac3e3f39
Merge pull request #40 from BohdanSmetanyuk/bug/input_node_connection
fixed bug with connection to first node
2020-08-25 19:32:45 +03:00
Bohdan Smetaniuk
883f8fff4c fixed bug with connection to first node 2020-08-25 19:23:49 +03:00
VoBa
2be3d9209f
Merge pull request #39 from BohdanSmetanyuk/code_fixes
code fixes
2020-08-25 14:33:00 +03:00
Bohdan Smetaniuk
67fc2f5a19 added logs 2020-08-25 14:22:58 +03:00
Bohdan Smetaniuk
1d5f5c5d80 code fixes 2020-08-25 14:04:47 +03:00
VoBa
787c33be73
Merge pull request #38 from BohdanSmetanyuk/for_build
fixes + processing attributes delete msg from edge
2020-08-25 12:53:21 +03:00
deaflynx
c09811b9d9 Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-08-25 08:26:24 +03:00
Bohdan Smetaniuk
581f23b0b0 fixes + processing attributes delete msg from edge 2020-08-21 18:50:11 +03:00
VoBa
a676fa9ca6
Merge pull request #37 from BohdanSmetanyuk/feature/read_templates_from_files
load mail templates from files
2020-08-20 16:23:27 +03:00
Bohdan Smetaniuk
8d60c67faf load mail templates from files 2020-08-20 14:45:32 +03:00
deaflynx
8db3df0388 Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-08-19 18:39:34 +03:00
Volodymyr Babak
30d686f752 Send response only if connected 2020-08-19 13:52:03 +03:00
Volodymyr Babak
23a2ecfe90 Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-08-18 17:57:45 +03:00
Volodymyr Babak
3e42f00cf7 Ack cloud messages 2020-08-18 17:52:11 +03:00
VoBa
422ef7564e
Merge pull request #36 from BohdanSmetanyuk/feature/propagate_relations
propagate delete/update action for relations
2020-08-18 16:55:11 +03:00
Bohdan Smetaniuk
2b2a513cd4 propagate relations delete/update 2020-08-18 15:46:49 +03:00
VoBa
ab14bcb963
Merge pull request #35 from BohdanSmetanyuk/feature/fetch_admin_settings
Feature/fetch admin settings
2020-08-14 16:44:01 +03:00
Volodymyr Babak
2797180176 Added isFullAccess check 2020-08-14 16:42:43 +03:00
Bohdan Smetaniuk
444681655e existing license 2020-08-14 15:43:46 +03:00
Bohdan Smetaniuk
79f77ebbba fetch admin settings 2020-08-14 13:52:40 +03:00
Volodymyr Babak
f29d15d8b7 Add/delete users to edge on assign/unassign to/from customer 2020-08-14 12:25:57 +03:00
deaflynx
cc645a938e Code cleaning from PE comparison of master vs. develop/2.5.3 2020-08-13 16:53:10 +03:00
Volodymyr Babak
bf21ff3c09 Added TTL for edge events 2020-08-12 16:31:45 +03:00
Volodymyr Babak
a75f52912e Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-08-12 14:05:21 +03:00
Volodymyr Babak
d0db49a2cb Fixed assign rule chain. Added sync of related rule chains 2020-08-12 14:05:08 +03:00
VoBa
8f4138632c
Merge pull request #34 from BohdanSmetanyuk/fix/incorrect_ts
Fix/incorrect ts in timeseries update msgs from cloud
2020-08-12 09:40:41 +03:00
Bohdan Smetaniuk
9f5a9d02f1 deleted unused imports 2020-08-11 15:44:13 +03:00
Bohdan Smetaniuk
224c0d87e4 fixed incorrect ts in timeseries update msgs from cloud 2020-08-11 15:41:09 +03:00
Volodymyr Babak
908bb8be7c Added .run folder to ignore 2020-08-10 18:44:46 +03:00
Volodymyr Babak
117547ae6b Fixed relation propagation to edge. Code review improvements 2020-08-07 17:44:06 +03:00
VoBa
f151737678
Merge pull request #31 from BohdanSmetanyuk/feature/widgets_bundle_fetch
short fix in EdgeEventType
2020-08-06 13:00:29 +03:00
Bohdan Smetaniuk
05a835f698 short fix in EdgeEventType 2020-08-06 12:06:40 +03:00
VoBa
e7906375a6
Merge pull request #30 from BohdanSmetanyuk/feature/widgets_bundle_fetch
WidgetsBundle fetch + WidgetTypes fetch
2020-08-06 11:37:54 +03:00
Bohdan Smetaniuk
4e167d8566 Merge remote-tracking branch 'upstream/feature/edge' into feature/widgets_bundle_fetch 2020-08-06 11:35:07 +03:00
Bohdan Smetaniuk
b5659fd32d Merge remote-tracking branch 'upstream/feature/edge' into feature/widgets_bundle_fetch 2020-08-06 10:41:18 +03:00
Bohdan Smetaniuk
7f848b3242 fixes in controller 2020-08-05 15:43:02 +03:00
Bohdan Smetaniuk
23e0fc7fb2 fetch system widgets bundles 2020-08-04 14:26:06 +03:00
Volodymyr Babak
869a492c2c Added support for Tenant Entity 2020-08-03 20:05:21 +03:00
deaflynx
1e0b9fee4d Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-08-03 10:26:06 +03:00
Volodymyr Babak
635086986b Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-07-31 18:05:27 +03:00
Volodymyr Babak
9980a72ee9 Fix connection if edge removed 2020-07-31 18:05:15 +03:00
Bohdan Smetaniuk
f17a4d2bc2 fixes 2020-07-31 17:45:26 +03:00