378 Commits

Author SHA1 Message Date
Igor Kulikov
969a686c74 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-10 19:37:26 +03:00
Igor Kulikov
d9321b4816 UI: Device profile alarm rules 2020-09-10 19:37:14 +03:00
Andrii Shvaika
a3326b4464 New type of credentials: MQTT 2020-09-10 17:17:42 +03:00
Igor Kulikov
3b55ebe5d4 Fix conflicts 2020-09-09 18:29:06 +03:00
Igor Kulikov
79e06fbbe7 UI: Device profile alarm rules 2020-09-09 18:27:28 +03:00
Andrii Shvaika
ad273deace Custom MQTT Topic filters in device profile 2020-09-09 17:26:35 +03:00
Andrii Shvaika
f3a5cb3162 AlarmRules 2020-09-08 18:06:48 +03:00
Andrii Shvaika
d440d500e5 Mqtt Transport Configuration 2020-09-03 18:38:11 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Andrii Shvaika
df823c8f90 Merge with UI changes 2020-09-02 19:10:46 +03:00
Andrii Shvaika
22755e8763 Device Profile implementation for Transport 2020-09-02 18:52:59 +03:00
Igor Kulikov
73a988b541 Add tenant profile data 2020-09-02 12:19:35 +03:00
Igor Kulikov
266af3c1a2 Introduce DeviceProfileInfo, release 3.2 upgrade script. 2020-08-21 13:34:10 +03:00
Igor Kulikov
ad87924437 Tenant and Device profile improvements 2020-08-20 19:44:29 +03:00
Igor Kulikov
2e6a98d8e0 Tenant/Device REST API controllers 2020-08-20 14:37:21 +03:00
Igor Kulikov
7841d11724 Tenant/Device profiles cache support. 2020-08-19 13:47:30 +03:00
Igor Kulikov
3ddf14668e Tenant and Device profiles DAO layer 2020-08-18 18:58:53 +03:00
vzikratyi
1660458546 Added new fields to ClientRegistrationTemplate 2020-08-13 18:21:26 +03:00
vzikratyi
f89ce19b1f Added logic to send 'access token' to custom mapper 2020-08-13 14:14:38 +03:00
vzikratyi
da9f29c933 Added 'comment' to ClientRegistrationTemplate 2020-08-13 11:48:14 +03:00
vzikratyi
2c537b28f4 Added ClientRegistrationTemplate 2020-08-12 17:31:34 +03:00
vzikratyi
32c8d7e5fd Removed 'registrationId' from ClientRegistration 2020-08-12 13:14:10 +03:00
vzikratyi
61a6fdbc03 Moved OAuth2 config to separate table in DB 2020-08-05 17:35:36 +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
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
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
vzikratyi
d22237796e Allow to pass several domains for oauth2 config (for sys_admin only) 2020-06-25 16:03:22 +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
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