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

127 Commits

Author SHA1 Message Date
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
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
vzikratyi
d5abe337be Added OAuth2ClientRegistrationService 2020-06-19 16:04:10 +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
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
viktor
4ed334a5d5 Merge branch 'develop/2.5.1' into oauth2-default-dashboard 2020-05-21 10:26:32 +03:00
viktor
cac7eb0d2b Added 'alwaysFullScreen' and 'defaultDashboardName' oauth2 properties 2020-05-20 18:27:26 +03:00
Igor Kulikov
cf593601b9 Sync multi-page guava cassandra session support 2020-05-18 16:03:51 +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
2d235cf9eb Improve Cassandra resultSet pagination 2020-05-08 19:34:08 +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
8dbc550fd3 Refactoring to review. Added tenantId and customerId. Added email tenant name strategy 2020-05-04 00:21:58 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +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
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Igor Kulikov
15a31044b2 Cleanup 2020-04-21 11:41:43 +03:00
hamza.slama
5b8ce2fb69 Move AlarmId To Id Package 2020-04-13 10:40:03 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608) 
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
 2020-04-13 09:34:35 +03:00