2362 Commits

Author SHA1 Message Date
Volodymyr Babak
869a492c2c Added support for Tenant Entity 2020-08-03 20:05:21 +03:00
vzikratyi
58464c54dc Fix merge 2020-08-03 17:31:02 +03:00
vzikratyi
ad04ad79ec Merge branch 'master' into feature/dynamic-oauth2
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
#	dao/src/main/resources/sql/schema-entities-hsql.sql
2020-08-03 15:08:26 +03:00
Andrii Shvaika
9e331a1768 Merge with 2.5.3 2020-08-03 11:04:50 +03:00
Dima Landiak
fea2f8799e improvements 2020-08-03 10:16:22 +03:00
Dima Landiak
ac007bea24 device swap feature init 2020-08-03 10:16:22 +03:00
Bohdan Smetaniuk
76b35010c7 WidgetTypes fetch feature 2020-07-31 15:53:22 +03:00
Bohdan Smetaniuk
5af7eb8221 WidgetsBundles fetch feature 2020-07-30 18:58:04 +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
d8fecd18d9 Get 'clientName' from 'registrationId' 2020-07-10 13:16:34 +03:00
Andrii Shvaika
5e3572e5c6 Dynamic Values Implementation Draft 2020-07-09 19:23:15 +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
vzikratyi
65d075035f Removed AdminSettingsId from ClientParams 2020-07-07 15:07:20 +03:00
Andrii Shvaika
2eb7949d57 Improvements 2020-07-06 17:04:14 +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
Igor Kulikov
7a19dee3eb UI: Dynamic filter value configuration 2020-07-03 12:15:11 +03:00
Igor Kulikov
cf6824cf22 Filter predicate dynamic value 2020-07-02 20:05:34 +03:00
Andrii Shvaika
63384d458b Alarm Search queries 2020-07-02 17:24:28 +03:00
vzikratyi
909a989e14 Removed authorizationGrantType from ClientRegistration 2020-06-26 17:41:00 +03:00
Volodymyr Babak
4cf29e2d89 Added support for dashboard telemetry and attributes update 2020-06-26 11:53:16 +03:00
Volodymyr Babak
a5d75e3800 Removed CREDENTIALS type. Use action instead 2020-06-25 18:06:02 +03:00
Volodymyr Babak
4b9642fc11 Moved getEdgeEventTypeByEntityType to EdgeUtils 2020-06-25 17:32:34 +03:00
vzikratyi
d22237796e Allow to pass several domains for oauth2 config (for sys_admin only) 2020-06-25 16:03:22 +03:00
Volodymyr Babak
214cc7a906 Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-06-25 11:45:15 +03:00
Volodymyr Babak
d1c1b44499 Fixed multithread issue with gRPC session - push from a single thread 2020-06-25 11:32:55 +03:00
Andrii Shvaika
44f00eb011 Improvements to WS API 2020-06-24 17:27:12 +03:00
vzikratyi
ba0f8a8ea5 Updated loading AttributeKvEntity by attribute_key 2020-06-24 12:41:19 +03:00
Bohdan Smetaniuk
cd70b6fb54 fixed bug + some refractoring 2020-06-24 12:39:58 +03:00
viktor
1d56a1937b Added license headers to new classes 2020-06-23 16:21:24 +03:00
viktor
334361577f Changed OAuth2Service, clear Tenant oauth2 config on deletion 2020-06-23 12:39:30 +03:00
Andrii Shvaika
808707afa4 Implementation and tests for Latest Subscription 2020-06-23 11:10:53 +03:00
Andrii Shvaika
db00c2ee0d Merge remote-tracking branch 'origin/feature/entity-data-query' into feature/entity-data-query 2020-06-22 16:01:53 +03:00
Andrii Shvaika
1f8d790fbe Refactoing of UUIDs storage 2020-06-22 11:10:28 +03:00
Igor Kulikov
2aaa51fe86 Data query serialization improvements 2020-06-19 20:40:41 +03:00
vzikratyi
de7c43d92b Renamed 'user_name_attribute' to 'user_name_attribute_name' 2020-06-19 18:25:01 +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
b08d9cc935 Made TenantNameStrategyType as Enum 2020-06-19 15:56:35 +03:00
vzikratyi
d7ff230bbd Merged OAuth2 mapper_config with client_registration 2020-06-19 10:41:34 +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
vzikratyi
b63f34316d Changed @Getter to @Data for Custom and Basic mappers 2020-06-18 18:58:30 +03:00
vzikratyi
d01d4ac48b Created oauth2 client_registration and mapper_config (as separate entities) 2020-06-18 18:49:57 +03:00
Volodymyr Babak
f4baab4969 Edge Notifitcation Service 2020-06-18 13:30:45 +03:00
Volodymyr Babak
cd2908fb59 Refactoring notification engine 2020-06-16 16:49:27 +03:00
Igor Kulikov
33f5edb5d4 Entity data query controller tests. Data query serialization. 2020-06-15 17:35:13 +03:00
Igor Kulikov
9460b09eef Entity data query builder improvements + initial tests 2020-06-15 13:39:18 +03:00