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

7677 Commits

Author SHA1 Message Date
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +03:00
Chantsova Ekaterina
6de23fe365 Refactoring 2020-10-09 11:07:10 +03:00
zbeacon
6683158c6b Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 09:53:08 +03:00
Chantsova Ekaterina
db0b0dcb30 Merge remote-tracking branch 'upstream/master' into improvement/extend-multiple-input-settings 2020-10-08 20:05:29 +03:00
Chantsova Ekaterina
e2b955299e Add missed custom translations for key labels 2020-10-08 19:58:39 +03:00
Igor Kulikov
e10696087e Merge branch 'master' into feature/wizard 2020-10-08 17:51:38 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +03:00
Chantsova Ekaterina
aa87ab024e Change widget json config 2020-10-08 16:21:04 +03:00
vzikratyi
ea9d18e32d Removed upper-case from providerId 2020-10-08 15:59:51 +03:00
vzikratyi
985e0350d8 Merge branch 'master' into feature/dynamic-oauth2-new-table 
# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
 2020-10-08 15:38:13 +03:00
Igor Kulikov
40e13cceb8 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-10-08 13:25:17 +03:00
Igor Kulikov
dfbc3c3e2d Fix nav tree component - run callbacks in angular zone 2020-10-08 13:25:01 +03:00
Vladyslav_Prykhodko
8dfc287342 Added device profile rule node UI settings 2020-10-08 13:05:05 +03:00
Igor Kulikov
305ec3067e Update angular version 2020-10-08 11:45:50 +03:00
vzikratyi
90234bf7a3 Fixed merge 2020-10-08 11:37:04 +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
5dd460b81d Some improvements 2020-10-07 14:13:25 +03:00
Andrii Shvaika
08e4b38b13 Merge branch 'feature/device-provision-3.2-onlyProfileVersion' of https://github.com/zbeacon/thingsboard into zbeacon-feature/device-provision-3.2-onlyProfileVersion 2020-10-07 12:13:19 +03:00
Igor Kulikov
69ec103588 UI: Completely remove letters capitalization in order to avoid issues in certain locales. 2020-10-07 11:58:43 +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
9c5b353a17 UI: Added validation unique domain 2020-10-07 00:44:36 +03:00
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +03:00
Igor Kulikov
98227ea665 Merge branch 'master' into develop/3.2 2020-10-06 19:06:35 +03:00
Chantsova Ekaterina
aa82a478cb Fix wrong number of digits after floating point in legend 2020-10-06 18:44:12 +03:00
Seok Hyun, Ga
95921a847a Update locale.constant-ko_KR.json 
Adding additional translation items.
 2020-10-06 18:43:35 +03:00
Serhii Mikhnytskyi
0227234a6d removed test component property 2020-10-06 18:31:26 +03:00
Serhii Mikhnytskyi
762c6dae55 improved performance of table widgets - removed unused ngZone.run and detectChanges, changed functions trackByRowIndex - now is used index, not id, minor improvements for functions, used after data updating. 2020-10-06 18:31:26 +03:00
Vladyslav_Prykhodko
1eccfcc76a Fixed incorrect display of alarm table columns(AckTime, Cleared time), with no parameters specified 2020-10-06 18:29:35 +03:00
Kalutka Zhenya
e35e54a764 Fix resize switch control 2020-10-06 18:28:40 +03:00
kalutkaz
7347230ec4
Update knob control (#3501) 
* Epdate knob control

* Fix click function

* Refactoring

* Formatting

* Change 'mouseup'
 2020-10-06 18:28:26 +03:00
Kalutka Zhenya
fbc58d0e2c Fix daterangepicker 2020-10-06 18:26:58 +03:00
Vladyslav Prykhodko
5d8a37e97a UI Updated dependency 2020-10-06 18:26:37 +03:00
Serhii Mikhnytskyi
dbf8bf6733 set lib attribute "animatedValue" to "true" in analogue-gauge.models.ts 2020-10-06 18:25:58 +03:00
Serhii Mikhnytskyi
1c3b956e56 modified parent method prepareFormValue in dashboard-form, deleted unused code in rulechain-page 2020-10-06 18:20:26 +03:00
Serhii Mikhnytskyi
3963b56102 dashboard-form name validation added, rule-chain-details name validation pattern and trim added 2020-10-06 18:20:26 +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
Chantsova Ekaterina
ed2920eddc Remove form reset when saving, add translatable error messages 2020-10-05 18:00:26 +03:00
Vladyslav_Prykhodko
fe00a9bd45 UI: Added support multiple domains is OAuth2 settings 2020-10-05 11:09:41 +03:00
zbeacon
2020da577d Changed provision device key/secret fields position in UI 2020-10-05 10:40:47 +03:00
zbeacon
dd0ab34625 Merge from develop/3.2 2020-10-05 08:54:44 +03:00
Vladyslav Prykhodko
e8d8382c74 UI: Added device provision to device profile 2020-10-04 00:05:52 +03:00
ShvaykaD
9fef6b02a3
[3.2] Feature/Proto Converter (#3423) 
* device post-telemetry & post-attributes & claim

* device rpc to/from server & attributes request, attributes updates

* refactoring & added implementation for gateway protos api

* added timeseries/attributes mqtt tests

* fix MqttTimseriesIntegrationTest values asserts

* mqtt attributes tests improvements

* optimized time for telemetry & attributes tests

* update proto files, refactoring converter, attribute requests tests

* added claim tests, attribute request test

* added deleted keys to gateway response on attributes request & refactored tests

* added attribute updates test & refactored attribute requests tests

* added attribute updates tests for gateways

* added tests for RPC

* fix tests & cleanup code

* fix typo & cleanup transport.proto file

* added more timeouts

* revert handleGetAttributesRequest method

* revert package-locks

* fix getJsonObjectForGateway method

* fix validateSharedResponseGateway method in AbstractMqttAttributesRequestIntegrationTest

* fix mqtt topics

* fix license headers

* refactor tests

* remove todo and lck files from pull

* improvements for claiming tests

* update device creation logic from gateway request

* refactoring

* extract TransportService process calls to private methods

* fix duplicates & removed empty lines
 2020-10-02 11:31:27 +03:00
Vladyslav Prykhodko
1b1dac30d4 UI: Improvment device-profile set default rule-chain 2020-10-02 00:54:26 +03:00
Vladyslav_Prykhodko
51a6278d44 UI: Hidden dynamic value in alarm rules 2020-09-30 12:30:01 +03:00
Vladyslav_Prykhodko
1d61b4f439 UI: Device profile alarm rules added dynamic source type - current device 2020-09-29 18:31:17 +03:00
Vladyslav_Prykhodko
f2af7d0831 UI add device wizard 2020-09-29 15:47:17 +03:00
Vladyslav_Prykhodko
4f30678554 UI Moved device credentials for new component 2020-09-29 10:33:29 +03:00
Vladyslav_Prykhodko
3816172b2a Refactoring OAuth2 2020-09-21 18:52:54 +03:00
Vladyslav_Prykhodko
556cb5aa5d Refactoring OAuth2 2020-09-21 16:10:00 +03:00