2511 Commits

Author SHA1 Message Date
Vladyslav Prykhodko
67d9c1eeef Fix: widget 'Pie - Flot' didn't call settingsSchema and dataKeySettingsSchema 2020-07-22 07:57:55 +03:00
Igor Kulikov
818891646a Add constraint 'device_credentials_device_id_unq_key' to upgrade script. 2020-07-21 20:04:47 +03:00
YevhenBondarenko
557d392847 fix license header 2020-07-21 15:10:01 +03:00
YevhenBondarenko
69895e5ac0 configuration improvements 2020-07-21 15:10:01 +03:00
Igor Kulikov
ea3c6f34ba Add findAlarmDataByQuery Rest API 2020-07-16 19:21:02 +03:00
VoBa
9db41693bd
Merge pull request #26 from BohdanSmetanyuk/bug/assign_entity_views_to_edge
fix in EntityViewUpdateMsg constructing
2020-07-16 16:49:49 +03:00
Bohdan Smetaniuk
daeb963195 fix in EntityViewUpdateMsg constructing 2020-07-16 16:34:18 +03:00
Andrii Shvaika
7da95d3bfa More debug logs 2020-07-16 09:08:16 +03:00
Bohdan Smetaniuk
e571bf24b6 complited attributes update and attributes delete feature 2020-07-15 19:37:01 +03:00
Andrii Shvaika
52ab135cb2 Fix entity duplication on duplicated attributes 2020-07-15 15:57:25 +03:00
Andrii Shvaika
bd9ec316ef Tiny improvements 2020-07-15 15:00:33 +03:00
Bohdan Smetaniuk
6ede96ef48 fix for POST_ATTRIBUTES_REQUEST 2020-07-15 14:54:25 +03:00
Bohdan Smetaniuk
d81804ac8d scope replaced to EntityDataProto 2020-07-14 19:22:31 +03:00
Bohdan Smetaniuk
2b14fa3634 fixed bug with saving server attributes in client scope 2020-07-14 15:38:21 +03:00
Andrii Shvaika
4c27b514a6 Merge remote-tracking branch 'origin/develop/2.5.3' 2020-07-14 10:35:11 +03:00
Andrii Shvaika
af1f6229bb Improved logging of failed and timeout messages 2020-07-14 10:34:20 +03:00
Andrii Shvaika
933c502ce3 Merge remote-tracking branch 'origin/master' 2020-07-13 15:47:42 +03:00
Andrii Shvaika
c2e36851fc Merge with 2.5.3 2020-07-13 15:47:28 +03:00
Volodymyr Babak
2071890ac9 Added device creation lock by device name 2020-07-13 11:46:22 +03:00
Andrew Shvayka
6ddf0a6398 Alarm Indexes improved 2020-07-12 01:06:31 +03:00
Andrew Shvayka
9ce9e004c4 Fix for transaction management 2020-07-11 18:40:57 +03:00
Andrew Shvayka
8808c268ae
Merge pull request #3076 from YevhenBondarenko/develop/2.5.3-batch-improvements
Develop/2.5.3 batch improvements
2020-07-10 20:21:30 +03:00
Andrii Shvaika
c4390e896a Different message on parse error 2020-07-10 17:06:19 +03:00
vzikratyi
9eb9302ee3 Used DB lock instead of Java lock 2020-07-10 15:54:34 +03:00
Andrii Shvaika
ce0bebf9e8 Cluster mode for Alarms API 2020-07-10 15:35:49 +03:00
YevhenBondarenko
e77127019f Ts batch improvements 2020-07-10 12:46:47 +03:00
Andrii Shvaika
86a7e9cfa2 Alarm API 2020-07-10 11:57:52 +03:00
Andrii Shvaika
5e3572e5c6 Dynamic Values Implementation Draft 2020-07-09 19:23:15 +03:00
VoBa
6d0ff4d8f2
Merge pull request #22 from BohdanSmetanyuk/bug/alarms
bug with alarms fixed
2020-07-09 17:30:30 +03:00
Bohdan Smetaniuk
6b153ee2ad bug with alarms fixed 2020-07-09 13:57:04 +03:00
Andrii Shvaika
fa8535ca95 Alarm Search Text 2020-07-09 13:23:46 +03:00
Igor Kulikov
31f0689f63 Websocket Api tests improvements 2020-07-09 12:35:47 +03:00
vzikratyi
5aba253928 Changed OAuth2ClientsDomainParams protocol 2020-07-09 12:11:49 +03:00
Igor Kulikov
6c5971a12c Merge branch 'master' into feature/entity-data-query 2020-07-08 15:23:53 +03:00
Igor Kulikov
bbb2c0d0a1 Alarm query optimizations 2020-07-08 15:17:52 +03:00
Igor Kulikov
86ebc3014f Revert controller tests filter 2020-07-07 19:10:53 +03:00
Igor Kulikov
562bbbe849 Fix upgrade scripts. 2020-07-07 18:02:29 +03:00
Volodymyr Babak
6c3d2d986e Added edge state. Added edge id and cloud type to proto 2020-07-07 17:59:12 +03:00
Andrii Shvaika
b7e1c039f3 Entity Data Query Upgrade Script 2020-07-07 15:37:37 +03:00
Andrew Shvayka
a17a85657c
Merge pull request #3046 from YevhenBondarenko/feature/uuid-update
Feature/UUID update
2020-07-07 15:31:18 +03:00
Andrii Shvaika
d102ef7d3f Alarm Implementation 2020-07-07 15:30:43 +03:00
YevhenBondarenko
4ede5894f7 refactored updating alarm relations. 2020-07-07 14:43:18 +03:00
YevhenBondarenko
8b770cbc96 refactored updating alarm relations. 2020-07-07 14:23:41 +03:00
VoBa
d43edb83fd
Merge pull request #20 from BohdanSmetanyuk/feature/edge_event_controller
added check permissions
2020-07-07 14:21:39 +03:00
YevhenBondarenko
7184ba1d89 refactored uuid upgrade and added updating alarm relations. 2020-07-07 14:12:12 +03:00
Bohdan Smetaniuk
9fdcd6a429 check permissions 2020-07-07 13:47:10 +03:00
deaflynx
bdc37d3eb0 Merged with BohdanSmetanyuk: added DefaultEdgeNotificationService,BaseEdgeEventControllerTest,EdgeEventControllerNoSqlTest,EdgeEventControllerSqlTest 2020-07-07 11:33:45 +03:00
deaflynx
978efe60fc Added EdgeEventController.java 2020-07-07 11:31:16 +03:00
vzikratyi
60857dd733 Refactored OAuth2Controller 2020-07-07 10:59:44 +03:00
Bohdan Smetaniuk
4621d28e33 deleted unused fields 2020-07-06 19:34:31 +03:00