Igor Kulikov
|
628ce7991d
|
Merge branch 'vzikratyi-tb-feature/dynamic-oauth2-new-table'
|
6 years ago |
|
Igor Kulikov
|
8cfbcee05e
|
Minor fixes
|
6 years ago |
|
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
|
6 years ago |
|
Igor Kulikov
|
93fc099ee3
|
Merge branch 'vvlladd28-improvement/device-profile/refactoring'
|
6 years ago |
|
Igor Kulikov
|
7640d32d3b
|
Fix conflicts
|
6 years ago |
|
Igor Kulikov
|
20c90c8a6f
|
Improve device/device profile components, remove unnecessary transport configurations
|
6 years ago |
Vladyslav_Prykhodko
|
06c3fb8eab
|
UI: Refactoring device profile
|
6 years ago |
|
Igor Kulikov
|
cb9f5cde85
|
Merge pull request #3561 from ChantsovaEkaterina/improvement/extend-multiple-input-settings
Multiple input widget: extend settings
|
6 years ago |
|
Igor Kulikov
|
48c0c9fd8f
|
Merge pull request #3559 from ChantsovaEkaterina/bug/missed-custom-translations-in-labels
Add missed custom translations for key labels
|
6 years ago |
|
Igor Kulikov
|
765ced2954
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
6 years ago |
|
Igor Kulikov
|
d13116db19
|
Update device transport type hints. Update device profile autocomplete - select first profile option
|
6 years ago |
ShvaykaD
|
d5bf25e2f3
|
revert the enqueue(root rule chain) method changes
|
6 years ago |
|
ShvaykaD
|
a045be771b
|
added null check for queueName
|
6 years ago |
|
ShvaykaD
|
0240476b4e
|
fix duplicates
|
6 years ago |
YevhenBondarenko
|
8e89ea9729
|
refactored
|
6 years ago |
|
YevhenBondarenko
|
a046459d62
|
added deviceCreationTime to the DeviceStateData
|
6 years ago |
|
YevhenBondarenko
|
fc92a8d536
|
fixed sending inactivity event after device creation.
|
6 years ago |
|
YevhenBondarenko
|
d838f2a867
|
fix NPE in DefaultTbDeviceProfileCache
|
6 years ago |
|
Vladyslav_Prykhodko
|
8c9328f9c5
|
UI: Improvement created device profile
|
6 years ago |
|
Vladyslav_Prykhodko
|
76485dfdad
|
UI: Improvement UI device profile alarm scheduler, added text select time interval
|
6 years ago |
|
Vladyslav_Prykhodko
|
30a6a462da
|
UI: Improvement view device profile settings
|
6 years ago |
|
Igor Kulikov
|
c7b57ca543
|
Add Device Wizard improvements
|
6 years ago |
Chantsova Ekaterina
|
6de23fe365
|
Refactoring
|
6 years ago |
vzikratyi
|
2db74b25a4
|
Removed 'name' from Github OAuth2 template
|
6 years ago |
|
Chantsova Ekaterina
|
db0b0dcb30
|
Merge remote-tracking branch 'upstream/master' into improvement/extend-multiple-input-settings
|
6 years ago |
|
Chantsova Ekaterina
|
e2b955299e
|
Add missed custom translations for key labels
|
6 years ago |
|
vzikratyi
|
ac055397b0
|
Added GITHUB mapper type
|
6 years ago |
|
Igor Kulikov
|
e10696087e
|
Merge branch 'master' into feature/wizard
|
6 years ago |
|
Vladyslav_Prykhodko
|
0f66d738c6
|
Merge upstream/master
|
6 years ago |
|
Chantsova Ekaterina
|
aa87ab024e
|
Change widget json config
|
6 years ago |
|
vzikratyi
|
e2791a289b
|
Removed EntityId for OAuth2Config
|
6 years ago |
|
vzikratyi
|
ea9d18e32d
|
Removed upper-case from providerId
|
6 years ago |
|
vzikratyi
|
985e0350d8
|
Merge branch 'master' into feature/dynamic-oauth2-new-table
# Conflicts:
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
|
6 years ago |
|
Igor Kulikov
|
40e13cceb8
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
6 years ago |
|
Igor Kulikov
|
dfbc3c3e2d
|
Fix nav tree component - run callbacks in angular zone
|
6 years ago |
|
Vladyslav_Prykhodko
|
8dfc287342
|
Added device profile rule node UI settings
|
6 years ago |
|
vzikratyi
|
c42c23c380
|
Refactored and fixed code
|
6 years ago |
|
vzikratyi
|
6ae75e295c
|
Removed LockService
|
6 years ago |
|
vzikratyi
|
d2f45db0a6
|
Removed unused changes to AttributeDao
|
6 years ago |
|
Igor Kulikov
|
c4b89e29ef
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
6 years ago |
|
Igor Kulikov
|
305ec3067e
|
Update angular version
|
6 years ago |
Andrii Shvaika
|
77d754ad90
|
Fetch Last Level Only improvement
|
6 years ago |
|
vzikratyi
|
90234bf7a3
|
Fixed merge
|
6 years ago |
|
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
|
6 years ago |
|
Andrii Shvaika
|
0cc52cd129
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
6 years ago |
|
Andrii Shvaika
|
d508bb671b
|
Automatic update of the root rule chain in 3.2
|
6 years ago |
|
Igor Kulikov
|
3c9a335910
|
Tests fix
|
6 years ago |
|
Igor Kulikov
|
059b456f70
|
Move device/tenant profile entitiy type enums to the end of list.
|
6 years ago |
|
Igor Kulikov
|
7db6158279
|
Increase MQTT attributes/timeseries tests timeouts.
|
6 years ago |
|
Igor Kulikov
|
795e1fd634
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
6 years ago |
