dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,648 Commits 106 Branches 71 Tags
Commit Graph

416 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Igor Kulikov
3acae2fbf2 Entity data query - query builder 2020-06-12 20:15:26 +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
Igor Kulikov
78a91b8c27 Temporarily version set to 2.5.2-SNAPSHOT 2020-06-04 10:09:02 +03:00
Igor Kulikov
b32e0de731 Version set to 3.0.1-SNAPSHOT 2020-06-04 10:05:41 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +03:00
VoBa
c0dfa4861b
[WIP] [3.0] Added OAuth2 Support (#2709) 
* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
 2020-05-04 11:51:08 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00