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

194 Commits

Author SHA1 Message Date
Igor Kulikov
d9a9690f6e Ability to embed dashboard page. Implement Api Usage page. 2020-11-27 17:35:19 +02:00
Igor Kulikov
52122d8047 Add send sms rule node help link 2020-11-26 12:09:35 +02:00
zbeacon
1895fd8330 Added translates for provisioning action types 2020-11-25 11:29:03 +02:00
Igor Kulikov
eb4f4baafb UI: Update Tenant Profile - add max emails and sms 2020-11-20 19:09:42 +02:00
Igor Kulikov
6f780b8fa5 Minor improvements 2020-11-20 18:36:02 +02:00
Igor Kulikov
d5cf27cdbf Sms provider configuration component improvements 2020-11-20 18:19:53 +02:00
Igor Kulikov
449cb5941d Fix Api Usage State alias 2020-11-20 15:17:31 +02:00
Igor Kulikov
1e1e3ec6a3 Introduce SMS Service. Add Send SMS Rule Node 2020-11-20 13:08:20 +02:00
Andrii Shvaika
bb833ee098 Merge branch 'feature/device-profile-telemetry-proto-schema' of https://github.com/ShvaykaD/thingsboard 2020-11-16 15:16:55 +02:00
ShvaykaD
861fd65109 merge with master 2020-11-13 16:33:41 +02:00
Igor Kulikov
f0ed4329d3
Merge pull request #3721 from YevhenBondarenko/feature/tenant-profile 
DefaultTenantProfileConfiguration improvements
 2020-11-13 16:33:25 +02:00
YevhenBondarenko
4b4e2b702e DefaultTenantProfileConfiguration improvements 2020-11-13 16:21:14 +02:00
ShvaykaD
4a18781304 added TransportPayloadTypeConfiguration, fix tests, ui 2020-11-13 16:19:40 +02:00
Chantsova Ekaterina
8f43eb86cd Add getEntityTimeseries method to Service Completion 2020-11-13 12:02:09 +02:00
ShvaykaD
18a57d638d merge with master 2020-11-11 18:25:29 +02:00
Igor Kulikov
a5e8cab5e0
Merge pull request #3700 from YevhenBondarenko/feature/api-usage-state-tmp 
api usage state alias improvements
 2020-11-11 14:03:40 +02:00
YevhenBondarenko
ebf10b55c8 api usage state alias improvements 2020-11-11 12:59:22 +02:00
Igor Kulikov
c97aaf099e
Merge pull request #3689 from ChantsovaEkaterina/improvement/get-timeseries-method 
Add getEntityTimeseries method to Attributes Service
 2020-11-11 09:07:43 +02:00
Igor Kulikov
d52a0d368a
Merge pull request #3653 from vvlladd28/bug/device-profile/show-scheduler-time 
UI: Fixed show not correct time for device profiles scheduler preview
 2020-11-11 09:03:26 +02:00
Igor Kulikov
1ba09a5006
Merge pull request #3627 from vvlladd28/improvement/legend-sort 
UI: Added new options for legend config (sort datakeys in legend)
 2020-11-11 09:02:26 +02:00
Chantsova Ekaterina
ae8686605f Refactoring 2020-11-09 15:54:05 +02:00
Chantsova Ekaterina
d40f5823ff Add getEntityTimeseries method to Attributes Service 2020-11-09 15:18:37 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
Vladyslav_Prykhodko
b9950d82e9 UI: Fixed show not correct time for device profiles scheduler preview 2020-10-29 14:10:05 -04:00
ShvaykaD
37c381996e ui updates 2020-10-29 14:58:28 +02:00
YevhenBondarenko
7724495cb1 added default queue for device profile 2020-10-28 17:20:53 +02:00
Vladyslav_Prykhodko
c40f6bf47c UI: Added new options for legend config (sort datakeys in legend) 2020-10-23 18:42:07 +03:00
YevhenBondarenko
41212e11c0 created tenant profile configuration 2020-10-22 15:50:12 +03:00
YevhenBondarenko
7e88376030 created alias ApiUsageState 2020-10-20 18:55:52 +03:00
Igor Kulikov
ed090b3e6c UI: Improve dialog actions style 2020-10-14 12:32:07 +03:00
Igor Kulikov
da7d88470e
Merge pull request #3575 from vvlladd28/improvement/oauth2 
Improvement OAuth2
 2020-10-13 10:47:20 +03:00
Igor Kulikov
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +03:00
Vladyslav_Prykhodko
1c2ec66f16 Merge remote-tracking branch 'upstream/master' into improvement/oauth2 2020-10-12 18:11:44 +03:00
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +03:00
Igor Kulikov
155b967b47 Improve device profile alarm rules UI 2020-10-12 17:29:27 +03:00
zbeacon
005ad70657 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-12 13:57:01 +03:00
Igor Kulikov
8cfbcee05e Minor fixes 2020-10-12 10:58:28 +03:00
Igor Kulikov
2b53b2f8db Merge branch 'feature/dynamic-oauth2-new-table' of https://github.com/vzikratyi-tb/thingsboard into vzikratyi-tb-feature/dynamic-oauth2-new-table 2020-10-12 10:42:21 +03:00
Igor Kulikov
7640d32d3b Fix conflicts 2020-10-12 10:18:43 +03:00
Igor Kulikov
20c90c8a6f Improve device/device profile components, remove unnecessary transport configurations 2020-10-12 10:12:42 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +03:00
Vladyslav_Prykhodko
30a6a462da UI: Improvement view device profile settings 2020-10-09 18:11:49 +03:00
zbeacon
35f6f40ca3 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 17:35:30 +03:00
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +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
zbeacon
e8220e5102 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-07 10:36:15 +03:00
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +03:00
Illia Barkov
0751824c33
Merge branch 'develop/3.2' into feature/device-provision-3.2-onlyProfileVersion 2020-10-06 12:47:03 +03:00
Vladyslav_Prykhodko
77d2c786af UI: Added device profile alarm conditional type 2020-10-05 18:18:46 +03:00
Vladyslav_Prykhodko
fe00a9bd45 UI: Added support multiple domains is OAuth2 settings 2020-10-05 11:09:41 +03:00