Volodymyr Babak
|
d79d00aa87
|
Merge remote-tracking branch 'upstream/master' into develop/3.3-edge
|
2020-12-07 10:46:15 +02:00 |
|
Igor Kulikov
|
d9a9690f6e
|
Ability to embed dashboard page. Implement Api Usage page.
|
2020-11-27 17:35:19 +02:00 |
|
Igor Kulikov
|
1e1e3ec6a3
|
Introduce SMS Service. Add Send SMS Rule Node
|
2020-11-20 13:08:20 +02:00 |
|
Igor Kulikov
|
a29aa64497
|
Add OAuth2 settings menu to SysAdmin home page
|
2020-10-15 12:51:02 +03:00 |
|
Volodymyr Babak
|
dd780d05df
|
Merge remote-tracking branch 'origin/master' into feature/3.0-edge
|
2020-10-12 12:00:54 +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 |
|
Vladyslav_Prykhodko
|
556cb5aa5d
|
Refactoring OAuth2
|
2020-09-21 16:10:00 +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
|
dc77426dab
|
Added field id in model MenuSection and BreadCrumb
|
2020-09-15 12:20:19 +03:00 |
|
Igor Kulikov
|
cc018f8876
|
UI: Device profiles
|
2020-09-02 18:32:57 +03:00 |
|
Igor Kulikov
|
f39d663827
|
UI: Tenant Profiles
|
2020-08-27 19:32:15 +03:00 |
|
Vladyslav_Prykhodko
|
21275c789f
|
Improvement Translated
|
2020-07-23 13:02:07 +03:00 |
|
Vladyslav_Prykhodko
|
483a3b847b
|
Add tenant menu settingOAuth2
Add validation unique parameters to settings OAuth2
|
2020-07-10 11:33:47 +03:00 |
|
Vladyslav_Prykhodko
|
7af3fe0050
|
Add system admin OAuth2 settings
|
2020-07-09 13:47:35 +03:00 |
|
deaflynx
|
bc28406594
|
Partial fix Edge Rule Chain page
|
2020-06-23 00:34:47 +03:00 |
|
deaflynx
|
5a07a7aca4
|
Merged UI-NGX with develop/3.0-edge-fixed
|
2020-06-21 20:38:43 +03:00 |
|
Vladyslav
|
e3e860fe3f
|
[3.0] Improvement code style (#2670)
* Clear code and styles
* Clear import
|
2020-04-27 09:27:14 +03:00 |
|
Igor Kulikov
|
3e2a87135f
|
Prepare for merge with master
|
2020-02-20 10:26:43 +02:00 |
|
Igor Kulikov
|
08e8c92970
|
Tenants and tenant admins pages.
|
2019-08-12 19:34:23 +03:00 |
|
Igor Kulikov
|
1e7f197c55
|
Base modules structure. Base services. Login and Home module implementation.
|
2019-08-09 19:13:18 +03:00 |
|