275 Commits

Author SHA1 Message Date
Dima Landiak
ac007bea24 device swap feature init 2020-08-03 10:16:22 +03:00
Bohdan Smetaniuk
71a3fa68f1 fixes 2020-07-31 11:38:25 +03:00
Bohdan Smetaniuk
c4d7f52cf3 filtering EdgeEvents with TIMESERIES_UPDATE 2020-07-30 19:46:33 +03:00
Volodymyr Babak
2b3e195c20 Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge 2020-07-28 17:38:45 +03:00
Andrii Shvaika
c2e36851fc Merge with 2.5.3 2020-07-13 15:47:28 +03:00
Andrii Shvaika
749664bcda tmp version set to 2.5.3-SNAPSHOT 2020-07-10 20:26:25 +03:00
vzikratyi
9eb9302ee3 Used DB lock instead of Java lock 2020-07-10 15:54:34 +03:00
Andrii Shvaika
fa8535ca95 Alarm Search Text 2020-07-09 13:23:46 +03:00
vzikratyi
5aba253928 Changed OAuth2ClientsDomainParams protocol 2020-07-09 12:11:49 +03:00
Igor Kulikov
fac7bcc0b9 Version set to 3.1.0-SNAPSHOT 2020-07-08 15:41:30 +03:00
Igor Kulikov
6c5971a12c Merge branch 'master' into feature/entity-data-query 2020-07-08 15:23:53 +03:00
Andrii Shvaika
aec2d388ce Alarm Websockets API 2020-07-06 17:04:14 +03:00
Andrii Shvaika
65fa1a7a9c Websockets Implementation 2020-07-06 17:04:14 +03:00
Dmytro Shvaika
7d739dfaae fix PsqlTsDao annotation & sql-ttl services 2020-07-03 14:08:33 +03:00
Andrii Shvaika
b707ea090b Query Improvement to use entity field aliases 2020-07-02 17:48:50 +03:00
Igor Kulikov
7446e012a6 Introduce Current user alias 2020-07-02 17:30:15 +03:00
Andrii Shvaika
63384d458b Alarm Search queries 2020-07-02 17:24:28 +03:00
vzikratyi
fa79331702 Added default value to 'localDatacenter' 2020-07-02 16:37:27 +03:00
vzikratyi
32a3c7b897 Moved hardcoded local datacenter name to config 2020-07-02 16:37:27 +03:00
vzikratyi
328c827744 Made method 'getAllOAuth2Params' public 2020-06-25 18:05:21 +03:00
vzikratyi
c30e8b3a2d Added method to delete system oauth2 config 2020-06-25 18:04:39 +03:00
Volodymyr Babak
4b9642fc11 Moved getEdgeEventTypeByEntityType to EdgeUtils 2020-06-25 17:32:34 +03:00
vzikratyi
0149c4b652 Get System OAuth2 config without tenantId 2020-06-25 16:45:50 +03:00
vzikratyi
55a2fe890e Added method to load oauth2 config with tenantId 2020-06-24 17:36:26 +03:00
vzikratyi
84a06e65fa Added removing full OAuth2 config on tenant deletion 2020-06-24 15:58:08 +03:00
vzikratyi
ba0f8a8ea5 Updated loading AttributeKvEntity by attribute_key 2020-06-24 12:41:19 +03:00
viktor
e650cb0c24 Added reading attributes by attribute_key 2020-06-23 19:20:00 +03:00
viktor
1d56a1937b Added license headers to new classes 2020-06-23 16:21:24 +03:00
viktor
5a00973b47 Implemented part of OAuth2Service 2020-06-23 14:38:50 +03:00
viktor
c3c889bbbf Added 'deleteAdminSettingByKey' method to AdminSettingsService 2020-06-23 14:37:56 +03:00
viktor
334361577f Changed OAuth2Service, clear Tenant oauth2 config on deletion 2020-06-23 12:39:30 +03:00
vzikratyi
a6eefa903e Added required methods to OAuth2Service 2020-06-22 17:37:35 +03:00
vzikratyi
6e7d0c633f Small refactoring 2020-06-22 16:19:03 +03:00
vzikratyi
7fcf8a9894 Removed oauth2 entities from DB 2020-06-22 16:00:52 +03:00
vzikratyi
6ad3de83b7 Moved getting ClientInfo to OAuth2Service 2020-06-19 17:35:31 +03:00
Volodymyr Babak
de11d1ce3d Test fixed. Other small updates 2020-06-19 16:46:33 +03:00
Volodymyr Babak
1633959912 Merge remote-tracking branch 'origin/feature/edge' into develop/3.0-edge 2020-06-19 16:06:49 +03:00
vzikratyi
d5abe337be Added OAuth2ClientRegistrationService 2020-06-19 16:04:10 +03:00
Volodymyr Babak
d96b845407 Merge remote-tracking branch 'upstream/master' into develop/3.0-edge 2020-06-19 10:19:40 +03:00
Volodymyr Babak
21ee2aec11 Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge 2020-06-18 19:24:34 +03:00
Volodymyr Babak
8462481ebf Refacroting of pushing edge notification events 2020-06-18 18:57:01 +03:00
Volodymyr Babak
cd2908fb59 Refactoring notification engine 2020-06-16 16:49:27 +03:00
Volodymyr Babak
600c9ec565 Refactoring of notification to edge. Added EdgeNotificationService and queue msg proto 2020-06-14 22:24:25 +03:00
Igor Kulikov
3acae2fbf2 Entity data query - query builder 2020-06-12 20:15:26 +03:00
Volodymyr Babak
e8afd97605 Pushed users from CE to edge 2020-06-12 10:36:03 +03:00
Volodymyr Babak
ab1014bf16 Formatting and license fix 2020-06-11 20:28:06 +03:00
Volodymyr Babak
3fc18988be Added update relation msg functionality 2020-06-11 20:10:47 +03:00
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +03:00
Andrii Shvaika
45479a79f9 Basic Structures 2020-06-10 18:08:22 +03:00
Igor Kulikov
bd98ce8deb Merge with develop/2.5.2 2020-06-04 10:11:35 +03:00