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 |
|
Vladyslav_Prykhodko
|
6ef7e813fe
|
UI: Added catch error get OAuth2
|
2020-10-13 10:02:30 +03:00 |
|
Vladyslav_Prykhodko
|
31676d2110
|
UI: Refactoring show error in device-credentials component
|
2020-10-13 09:09:12 +03:00 |
|
Vladyslav Prykhodko
|
29b9682ff1
|
UI: Added device profile show settings in edit mode
|
2020-10-13 01:41:13 +03:00 |
|
Vladyslav Prykhodko
|
e113daa085
|
UI: Added validation scope
|
2020-10-13 00:59:56 +03:00 |
|
Igor Kulikov
|
19b8464937
|
Merge device provisioning feature
|
2020-10-12 19:39:47 +03:00 |
|
Vladyslav_Prykhodko
|
054fcba46f
|
UI: Change OAuth2 templated icon
|
2020-10-12 19:33:52 +03:00 |
|
Chantsova Ekaterina
|
df784db8a1
|
Refactoring
|
2020-10-12 19:31:42 +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
|
40be6e588c
|
Fix device wizard dialog. Fix install script for oauth2 client registration templates.
|
2020-10-12 18:05:26 +03:00 |
|
Igor Kulikov
|
155b967b47
|
Improve device profile alarm rules UI
|
2020-10-12 17:29:27 +03:00 |
|
ShvaykaD
|
3cd88e6d15
|
Merge branch 'master' of github.com:thingsboard/thingsboard into feature/device-profile-telemetry-proto-schema
|
2020-10-12 16:47:07 +03:00 |
|
ShvaykaD
|
8d4718320b
|
init commit
|
2020-10-12 16:21:05 +03:00 |
|
Chantsova Ekaterina
|
6d4245d603
|
Chart tooltips: fix wrong number of decimals after floating point
|
2020-10-12 15:34:02 +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 |
|
Volodymyr Babak
|
dd780d05df
|
Merge remote-tracking branch 'origin/master' into feature/3.0-edge
|
2020-10-12 12:00:54 +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 |
|
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 |
|
Igor Kulikov
|
48c0c9fd8f
|
Merge pull request #3559 from ChantsovaEkaterina/bug/missed-custom-translations-in-labels
Add missed custom translations for key labels
|
2020-10-12 09:12:42 +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 |
|
Igor Kulikov
|
d13116db19
|
Update device transport type hints. Update device profile autocomplete - select first profile option
|
2020-10-09 19:23:02 +03:00 |
|
Vladyslav_Prykhodko
|
8c9328f9c5
|
UI: Improvement created device profile
|
2020-10-09 18:12:25 +03:00 |
|
Vladyslav_Prykhodko
|
76485dfdad
|
UI: Improvement UI device profile alarm scheduler, added text select time interval
|
2020-10-09 18:12:06 +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 |
|
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 |
|