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

1130 Commits

Author SHA1 Message Date
Igor Kulikov
e0ac59b94b UI: Device provisioning autogenerate device key and secret 2020-10-13 11:08:13 +03:00
Vladyslav_Prykhodko
6ef7e813fe UI: Added catch error get OAuth2 2020-10-13 10:02:30 +03:00
Vladyslav_Prykhodko
1f7623352a UI: refactoring OAuth2/Login Page and added oauth mapperType GITHUB 2020-10-12 18:11:22 +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
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
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +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
Chantsova Ekaterina
e2b955299e Add missed custom translations for key labels 2020-10-08 19:58:39 +03:00
Vladyslav_Prykhodko
0f66d738c6 Merge upstream/master 2020-10-08 17:28:40 +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
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
Vladyslav_Prykhodko
fe00a9bd45 UI: Added support multiple domains is OAuth2 settings 2020-10-05 11:09:41 +03:00
Vladyslav_Prykhodko
f2af7d0831 UI add device wizard 2020-09-29 15:47:17 +03:00
Vladyslav_Prykhodko
556cb5aa5d Refactoring OAuth2 2020-09-21 16:10:00 +03:00
Vladyslav_Prykhodko
4c07e72117 Refactoring 2020-09-21 14:00:13 +03:00
Vladyslav_Prykhodko
1f3bae922e UI updated OAuth2 for new endpoint 2020-09-21 10:53:42 +03:00
Vladyslav_Prykhodko
ae92f065e6 Add select login provider templated 2020-09-17 10:31:35 +03:00
Igor Kulikov
692f575661 Merge with master 2020-09-16 12:12:59 +03:00
Vladyslav_Prykhodko
70ca190f59 UI add rule-chain autocompleted 2020-09-15 19:51:57 +03:00
Chantsova Ekaterina
b0372b3525 Fix hiding keys in legend 2020-09-15 19:51:40 +03:00
Vladyslav_Prykhodko
dc77426dab Added field id in model MenuSection and BreadCrumb 2020-09-15 12:20:19 +03:00
Igor Kulikov
d9321b4816 UI: Device profile alarm rules 2020-09-10 19:37:14 +03:00
Vladyslav_Prykhodko
edcaebe9ac Refactoring layout oauth2 templated 2020-09-07 17:19:12 +03:00
Igor Kulikov
af77d57768 Merge with master 2020-09-07 15:15:41 +03:00
Igor Kulikov
83ea3f0836 Move from device type to device profile 2020-09-07 14:45:41 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Vladyslav_Prykhodko
903080f4f3 Add correct sort dataKey 2020-09-03 12:40:17 +03:00
Vladyslav_Prykhodko
47a7e3b31b Fixed after sort legend keys, is not correct dataKey index; Refactoring 2020-09-02 19:20:13 +03:00
Igor Kulikov
cc018f8876 UI: Device profiles 2020-09-02 18:32:57 +03:00
vzikratyi
faf0184cff Merge remote-tracking branch 'upstream/master' into feature/dynamic-oauth2-new-table 
# Conflicts:
#	application/src/main/data/upgrade/3.1.0/schema_update.sql
 2020-08-31 10:27:39 +03:00
Igor Kulikov
f39d663827 UI: Tenant Profiles 2020-08-27 19:32:15 +03:00
Igor Kulikov
868234f13d Tenant, device profiles UI 2020-08-26 15:00:11 +03:00
Vladyslav_Prykhodko
86a991162f Improvment encode-state params for dashboard 2020-08-21 15:10:17 +03:00
Igor Kulikov
a95af6a303
Merge pull request #3309 from ChantsovaEkaterina/improvement/format-value 
Add check for null when formatting value
 2020-08-14 17:07:41 +03:00
Chantsova Ekaterina
99f8357a98 Add check for null when formatting value 2020-08-14 12:07:28 +03:00
Igor Kulikov
985510b51d Fix commonJs import warnings 2020-08-14 11:43:46 +03:00
Igor Kulikov
e72c689e9c Fix compile errors 2020-08-13 19:52:17 +03:00
Igor Kulikov
1533a95fa1 Upgrade angular to 10 2020-08-13 19:00:48 +03:00
Vladyslav_Prykhodko
968f2745a0 Updated example delete marker/polygon for map 2020-08-12 13:07:09 +03:00
Vladyslav_Prykhodko
ce649822e2 Add sort metadata key 2020-08-11 17:43:19 +03:00
Vladyslav_Prykhodko
e3b8c28bc6 Add sorting object key 2020-08-11 13:43:37 +03:00
Igor Kulikov
e7aae9664a Add new alias entity type - Current User Owner 2020-08-10 15:34:23 +03:00
Igor Kulikov
a736490a36
Merge pull request #3269 from vvlladd28/bug/bulk-import 
[3.0] Correction bulk provision without telemetry
 2020-08-10 14:36:56 +03:00
Igor Kulikov
389988fbcf
Merge pull request #3267 from vvlladd28/improvmnet/map/empty-data 
[3.0] Fixed loading of data used by post-processing function in key setting
 2020-08-10 14:35:20 +03:00
Igor Kulikov
c1b53afd8a Add entity description to datasource. Fix map markers color. 2020-08-10 14:34:05 +03:00
Vladyslav_Prykhodko
85a1448b43 Correction bulk provision without telemetry 2020-08-10 12:27:28 +03:00
Vladyslav Prykhodko
ec7ea7042a Fixed loading of data used by post-processing function in key settings for map widgets 2020-08-10 00:15:09 +03:00