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

693 Commits

Author SHA1 Message Date
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
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
Volodymyr Babak
3d3dd88710 Merge remote-tracking branch 'origin/develop/2.5.1' into feature/edge 2020-06-02 16:56:06 +03:00
Volodymyr Babak
134148c49f Removed edgeId. Code clean up and refactoring 2020-06-02 12:46:57 +03:00
Volodymyr Babak
8416c206ff Fixed rule chain relation. Fixed default edge removal 2020-06-01 22:08:30 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Volodymyr Babak
85a88ee499 Removed assigned edges from dashboard 2020-05-27 14:40:39 +03:00
Volodymyr Babak
6ab3714ac5 Added default rule chain for server side 2020-05-27 09:22:25 +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
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +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
Bohdan Smetaniuk
c1c725542a fixed bug with customer assignment to edge 2020-04-29 20:05:29 +03:00
Volodymyr Babak
24f2ea502c Push credentials updates to edge 2020-04-27 13:53:51 +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
Volodymyr Babak
767d0cfc58 Merge branch 'feature/edge' into develop/3.0-edge 2020-04-20 14:58:31 +03:00
Volodymyr Babak
9dbe3d4d6b Fixed fetch or SYSTEM rule chains 2020-04-14 12:53:22 +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
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00