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

122 Commits

Author SHA1 Message Date
vzikratyi
6ae75e295c Removed LockService 2020-10-08 12:21:53 +03:00
vzikratyi
d2f45db0a6 Removed unused changes to AttributeDao 2020-10-08 11:47:11 +03:00
vzikratyi
b02fbe860c Merge branch 'develop/3.2' into feature/dynamic-oauth2-new-table 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
#	application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
#	dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
#	dao/src/test/resources/sql/hsql/drop-all-tables.sql
#	dao/src/test/resources/sql/psql/drop-all-tables.sql
#	dao/src/test/resources/sql/timescale/drop-all-tables.sql
#	ui-ngx/src/app/modules/home/pages/tenant/tenant.component.ts
 2020-10-08 11:22:13 +03:00
Andrii Shvaika
b5bfb082b7 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-10-05 11:34:37 +03:00
Andrii Shvaika
080a5f1587 Rule Node States 2020-10-02 17:55:40 +03:00
Valerii Sosliuk
17053118e1 rule chain bulk import export 2020-10-02 13:54:06 +03:00
vzikratyi
c7e236499e Added support for multiple domains in OAuth2 config 2020-10-01 17:22:17 +03:00
vzikratyi
12e2d2efb7 Packed domain objects to ClientParams 2020-09-23 12:49:30 +03:00
vzikratyi
e778b3155a Remove OAuth2Config functionality from Tenant 2020-09-21 17:33:27 +03:00
vzikratyi
bfc3e75fc9 Unpacked Domain objects from ClientParams 2020-09-17 11:14:27 +03:00
vzikratyi
c3407bfddc Group ClientRegistrations by Domain 2020-09-16 16:43:59 +03:00
vzikratyi
14939c27e6 Added 'deleteByDomain' for OAuth2Service 2020-09-16 16:43:57 +03:00
Igor Kulikov
af77d57768 Merge with master 2020-09-07 15:15:41 +03:00
Igor Kulikov
83ea3f0836 Move from device type to device profile 2020-09-07 14:45:41 +03:00
Andrii Shvaika
73a1a79821 Device Profile updates 2020-09-04 16:51:56 +03:00
Trevor Muraro
57076e64a6 Add full DataStax Java Driver SSL configs 2020-09-04 14:22:28 +03:00
Andrii Shvaika
e67946e47f Upgrade script implementation 2020-09-04 12:53:22 +03:00
Igor Kulikov
7e55fd138d Restore version 3.1.1-SNAPSHOT 2020-09-01 14:55:41 +03:00
Igor Kulikov
f2822b2c3e Temporarily version set to 2.5.5-SNAPSHOT 2020-09-01 14:53:30 +03:00
Igor Kulikov
16f088ecf9 Merge with master 2020-09-01 14:40:28 +03:00
YevhenBondarenko
4df660fe03 added maven-source-plugin 2020-08-31 12:39:41 +03:00
vzikratyi
2cd5b646e3 Fixed merge 2020-08-31 10:43:15 +03:00
vzikratyi
faf0184cff Merge remote-tracking branch 'upstream/master' into feature/dynamic-oauth2-new-table 
# Conflicts:
#	application/src/main/data/upgrade/3.1.0/schema_update.sql
 2020-08-31 10:27:39 +03:00
Igor Kulikov
8e3c399087 Restore version 3.1.1-SNAPSHOT 2020-08-21 14:01:08 +03:00
Igor Kulikov
e40d13ebcb Temp versions set to 2.5.4-SNAPSHOT 2020-08-21 13:59:06 +03:00
Igor Kulikov
266af3c1a2 Introduce DeviceProfileInfo, release 3.2 upgrade script. 2020-08-21 13:34:10 +03:00
Igor Kulikov
3ddf14668e Tenant and Device profiles DAO layer 2020-08-18 18:58:53 +03:00
Igor Kulikov
7d7a50628b Version set to 3.2.0-SNAPSHOT 2020-08-17 18:11:43 +03:00
Igor Kulikov
654e380efd Version set to 3.1.1-SNAPSHOT 2020-08-13 12:42:37 +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
YevhenBondarenko
6458db74fa EntityView improvements 2020-08-04 20:15:31 +03:00
Igor Kulikov
974bfd39a5 Update EntityView - copy latest timeseries, delete previous attributes, latest timeseries on entity view update 2020-08-04 14:53:59 +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
Yevhen Bondarenko
02db986546
Feature/separate ts (#3190) 
* created annotations for ts latest and created LatestDatabaseSchemaService for cassandra, hsql, psql, timescale

* created ts latest dao

* fixed tests and refactored

* refactored

* refactored

* created latest dao configs

* fix SqlTimeseriesDaoConfig

* refactoring, and deleted annotation @SqlDao

* refactoring

* created migration script for ts latest

* refactoring

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-08-03 11:09:13 +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
9eb9302ee3 Used DB lock instead of Java lock 2020-07-10 15:54:34 +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
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