Andrii Shvaika
|
6ea39e835e
|
Transport Rate Limits are now configurable via Tenant Profile
|
2020-10-15 18:16:27 +03:00 |
|
Andrii Shvaika
|
356d4ff26c
|
Profile Node improvements in cluster mode
|
2020-10-14 12:07:19 +03:00 |
|
Andrii Shvaika
|
d3f519a2b3
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-14 11:06:18 +03:00 |
|
Igor Kulikov
|
52e6e76ac6
|
Oauth2 - set provider name to created user additionalInfo. UI: Improve device profile alarm rules.
|
2020-10-13 19:48:46 +03:00 |
|
Andrii Shvaika
|
c9dd5187b8
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-13 14:49:58 +03:00 |
|
Andrii Shvaika
|
7a09f8c718
|
Minor improvemetns
|
2020-10-13 14:46:35 +03:00 |
|
Igor Kulikov
|
fac68e9884
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-13 13:21:06 +03:00 |
|
Igor Kulikov
|
8c29339f13
|
Add support for port in oauth2 domain name. Update proxy.conf to support oauth2 urls
|
2020-10-13 13:20:54 +03:00 |
|
Andrii Shvaika
|
6f80cf95e2
|
Tenant Profile Cache
|
2020-10-13 11:53:22 +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
|
4596e4163d
|
Merge pull request #3574 from ChantsovaEkaterina/bug/chart-tooltips-wrong-number-of-decimals-after-floating-point
Bug/chart tooltips wrong number of decimals after floating point
|
2020-10-13 10:39:24 +03:00 |
|
Igor Kulikov
|
19b8464937
|
Merge device provisioning feature
|
2020-10-12 19:39:47 +03:00 |
|
Vladyslav_Prykhodko
|
220c5f6275
|
UI: Change OAuth2 templated json icon
|
2020-10-12 19:35:11 +03:00 |
|
Vladyslav_Prykhodko
|
1c2ec66f16
|
Merge remote-tracking branch 'upstream/master' into improvement/oauth2
|
2020-10-12 18:11:44 +03:00 |
|
Igor Kulikov
|
40be6e588c
|
Fix device wizard dialog. Fix install script for oauth2 client registration templates.
|
2020-10-12 18:05:26 +03:00 |
|
vzikratyi
|
4952c310a4
|
Added mapperConfig to OAuth2Template
|
2020-10-12 17:34:49 +03:00 |
|
zbeacon
|
1a718593ec
|
Refactoring
|
2020-10-12 16:19:36 +03:00 |
|
Chantsova Ekaterina
|
6d4245d603
|
Chart tooltips: fix wrong number of decimals after floating point
|
2020-10-12 15:34:02 +03:00 |
|
Andrii Shvaika
|
6d185f1c01
|
Improvements to device profile rule node
|
2020-10-12 14:29:20 +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 |
|
zbeacon
|
ca4e9238c8
|
Fix for device provision tests
|
2020-10-12 13:30:23 +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
|
cb9f5cde85
|
Merge pull request #3561 from ChantsovaEkaterina/improvement/extend-multiple-input-settings
Multiple input widget: extend settings
|
2020-10-12 09:13:50 +03:00 |
|
zbeacon
|
6e4c404929
|
Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion
|
2020-10-12 08:25:34 +03:00 |
|
ShvaykaD
|
d5bf25e2f3
|
revert the enqueue(root rule chain) method changes
|
2020-10-09 18:44:37 +03:00 |
|
ShvaykaD
|
a045be771b
|
added null check for queueName
|
2020-10-09 18:44:37 +03:00 |
|
ShvaykaD
|
0240476b4e
|
fix duplicates
|
2020-10-09 18:44:37 +03:00 |
|
YevhenBondarenko
|
8e89ea9729
|
refactored
|
2020-10-09 18:44:37 +03:00 |
|
YevhenBondarenko
|
a046459d62
|
added deviceCreationTime to the DeviceStateData
|
2020-10-09 18:44:37 +03:00 |
|
YevhenBondarenko
|
fc92a8d536
|
fixed sending inactivity event after device creation.
|
2020-10-09 18:44:37 +03:00 |
|
YevhenBondarenko
|
d838f2a867
|
fix NPE in DefaultTbDeviceProfileCache
|
2020-10-09 18:41:14 +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 |
|
zbeacon
|
93278f7236
|
Refactoring according to comments
|
2020-10-09 17:32:32 +03:00 |
|
vzikratyi
|
2db74b25a4
|
Removed 'name' from Github OAuth2 template
|
2020-10-09 10:37:28 +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 |
|
zbeacon
|
d032b0a3f7
|
Adding tests
|
2020-10-09 09:28:04 +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 |
|
vzikratyi
|
ac055397b0
|
Added GITHUB mapper type
|
2020-10-08 18:22:16 +03:00 |
|
zbeacon
|
6b72e82104
|
Improvement
|
2020-10-08 17:30:35 +03:00 |
|
Vladyslav_Prykhodko
|
0f66d738c6
|
Merge upstream/master
|
2020-10-08 17:28:40 +03:00 |
|
zbeacon
|
17ca3cfab4
|
Refactoring
|
2020-10-08 16:51:28 +03:00 |
|
Chantsova Ekaterina
|
aa87ab024e
|
Change widget json config
|
2020-10-08 16:21:04 +03:00 |
|
zbeacon
|
6df9219790
|
Improvements for provisioning
|
2020-10-08 16:13:45 +03:00 |
|
vzikratyi
|
e2791a289b
|
Removed EntityId for OAuth2Config
|
2020-10-08 16:04:03 +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 |
|
zbeacon
|
adf5069da1
|
Added ability to provision credentials type from device using provision feature
|
2020-10-08 15:08:29 +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
|
0cc52cd129
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
2020-10-08 10:57:58 +03:00 |
|
Andrii Shvaika
|
d508bb671b
|
Automatic update of the root rule chain in 3.2
|
2020-10-08 10:57:48 +03:00 |
|