Skip to content

Commit ac785bc

Browse files
committed
Merge branch 'dev'
2 parents e4e586f + af25bde commit ac785bc

14 files changed

+45
-28
lines changed

docs/en/Features-Angular-Host-Settings.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can also select a default edition, so a newly registered tenant will be assi
3333

3434
## User Management
3535

36-
![User Management Settings](images/host-settings-user-management-4.png)
36+
![User Management Settings](images/host-settings-user-management-6.png)
3737

3838
User related settings can be configured under this tab. You can force email confirmation for login. You can enable phone number verification. Also, you can enable cookie consent so ASP.NET Zero shows a cookie consent bar for the users to accept cookie policy of your application.
3939

@@ -43,17 +43,11 @@ You can enable/disable captcha on users login page.
4343
4444
You can also enable/disable session timeout control. If it is enable and the user does not provide any input to the site during the timeout period, a countdown modal will be displayed to user. If the user still does not provide an entry to the site during the modal countdown period, user will be log out.
4545

46-
Each tenant can allow tenant users to use Gravatar profile picture or not.
47-
48-
##### Password
49-
50-
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
51-
52-
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
46+
Each tenant can allow tenant users to use Gravatar profile picture or not. Additionally, you can adjust the size of the profile picture in megabytes (MB) and set the dimensions in pixels (px) for width and height.
5347

5448
## Security
5549

56-
![Security Settings](images/host-settings-security-5.png)
50+
![Security Settings](images/host-settings-security-6.png)
5751

5852
**Security** tab in host settings page contains password complexity settings. Host can define system wide password complexity settings in this tab. Each tenant can override this setting in tenant settings page.
5953

@@ -65,6 +59,12 @@ This tab also contains user lock-out settings and two factor login settings as w
6559
>
6660
> * If user does not have a verified phone number, user will be logged in without sms verification.
6761
62+
##### Password
63+
64+
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
65+
66+
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
67+
6868
## Email
6969

7070
![Email Settings](images/host-settings-email.png)

docs/en/Features-Angular-Tenant-Settings.md

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ Each tenant can allow tenant users to use Gravatar profile picture or not.
4242

4343
Security tab contains password complexity settings. Each tenant can define password complexity settings in this tab for their account. Each tenant can also configure user lock out settings.
4444

45+
##### Password
46+
47+
If MultiTenancyEnabled is set to false, the password expiration settings will apply globally to all active users across the application, rather than being configurable for each tenant.
48+
49+
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
50+
51+
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
52+
4553
## Invoice
4654

4755
![Invoice settings](images/tenant-settings-core-invoice.png)

docs/en/Features-Mvc-Core-Host-Settings.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can also select a default edition, so a newly registered tenant will be assi
3333

3434
## User Management
3535

36-
![User Management Settings](images/host-settings-user-management-4.png)
36+
![User Management Settings](images/host-settings-user-management-6.png)
3737

3838
User related settings can be configured under this tab. You can force email confirmation for login. You can enable phone number verification. Also, you can enable cookie consent so ASP.NET Zero shows a cookie consent bar for the users to accept cookie policy of your application.
3939

@@ -43,22 +43,22 @@ You can enable/disable captcha on login page.
4343
4444
You can also enable/disable session timeout control. If it is enable and the user does not provide any input to the site during the timeout period, a countdown modal will be displayed to user. If the user still does not provide an entry to the site during the modal countdown period, user will be log out.
4545

46-
Each tenant can allow tenant users to use Gravatar profile picture or not.
47-
48-
##### Password
49-
50-
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
51-
52-
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
46+
Each tenant can allow tenant users to use Gravatar profile picture or not. Additionally, you can adjust the size of the profile picture in megabytes (MB) and set the dimensions in pixels (px) for width and height.
5347

5448
## Security
5549

56-
![Security Settings](images/host-settings-security-5.png)
50+
![Security Settings](images/host-settings-security-6.png)
5751

5852
**Security** tab in host settings page contains password complexity settings. Host can define system wide password complexity settings in this tab. Each tenant can override this setting in tenant settings page.
5953

6054
This tab also contains user lock-out settings and two factor login settings as well.
6155

56+
##### Password
57+
58+
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
59+
60+
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
61+
6262
## Email
6363

6464
![Email Settings](images/host-settings-email.png)

docs/en/Features-Mvc-Core-Tenant-Settings.md

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ Each tenant can allow tenant users to use Gravatar profile picture or not.
4242

4343
Security tab contains password complexity settings. Each tenant can define password complexity settings in this tab for their account. Each tenant can also configure user lock out settings.
4444

45+
##### Password
46+
47+
If MultiTenancyEnabled is set to false, the password expiration settings will apply globally to all active users across the application, rather than being configurable for each tenant.
48+
49+
You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.
50+
51+
You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
52+
4553
## Invoice
4654

4755
![Invoice settings](images/tenant-settings-core-invoice.png)

docs/en/Public-Website.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@ Note that, in development time script files are not minified. When you are publi
1010

1111
We are ready to run the application using Visual Studio. So, just run the application using Visual Studio and it will display the main page of the Public website project.
1212

13-
<img src="images/frontend-homepage.jpg" alt="Frontend home page" class="img-thumbnail" width="500" height="496" />
13+
<div style="text-align: center;">
14+
<img src="images/frontend-homepage.png" alt="Frontend home page" class="img-thumbnail text-center" width="700" height="398" />
15+
</div>
1416

15-
There are two pages here: **Home Page** and **About**. Contents of these pages are just placeholders and for demo purposes. You can completely remove content and build your page upon your needs. Also, you should change the **logo** with your Company's logo.
17+
There is one page here: **Home Page**. Content of this page is just placeholders and for demo purposes. You can completely remove content and build your page upon your needs. when you update the **logo** in the ASP.NET Zero application panel, the change will also be reflected on the Public Website.
1618

17-
See [metronic front-end theme](https://preview.keenthemes.com/free-bootstrap-corporate/) for all possibilities and components to build a richer web site.
19+
See [metronic 8 landing page theme](https://preview.keenthemes.com/metronic8/demo1/landing.html) for all possibilities and components to build a richer web site.
1820

19-
Menus are defined in **FrontEndNavigationProvider** class. When you add a new menu item here, it will be automatically shown in the menu. There is a **Login** link at the top right corner. This link takes user to the **Login page** to enter to the **Angular** application. After the login, user will be redirected back to public website.
21+
There is a **Login** link at the top right corner. This link takes the user to the **Login** page to enter the application. After logging in, the user will be redirected back to the public website. Additionally, there is a language switcher dropdown at the top right corner.
2022

2123
## Layout
2224

2325
Layout of front-end pages are located under **Views/Layout** folder:
2426

25-
<img src="images/frontend-layout-views-core.png" alt="Frontend layout views" class="img-thumbnail" width="193" height="253" />
27+
<img src="images/frontend-layout-views-core.png" alt="Frontend layout views" class="img-thumbnail" />
2628

27-
**\_Layout** is the main layout file that includes scripts and styles. Language flags and the menu is rendered in **Header component** which is located under Shared/Components. \_PreFooter is not used but you can add
28-
it to the \_Layout if you want.
29+
**\_Layout** is the main layout file that includes scripts and styles. The menu is rendered in **Header component** which is located under Shared/Components.
2930

3031
## New Tenant Registration
3132

@@ -35,15 +36,15 @@ When you click "**New Tenant**" link (at the top right area) you are redirected
3536

3637
Actually, this UI is located in the main application. When you pick an edition, you are redirected to the payment or register form depending on the button you clicked. Register form is shown as below:
3738

38-
<img src="images/tenant-signup-v3.png" alt="Tenant register form" class="img-thumbnail" />
39+
<img src="images/tenant-signup-v4.png" alt="Tenant register form" class="img-thumbnail" />
3940

4041
## Single Sign On
4142

4243
Public web site has a login integration to the main application. When you click to login button (at the top right area) you are redirected to the main application. If you are already logged then you automatically
4344
login in the public web site too. If not, you can enter your username and password to login. Then you are redirected back to the public web site and your username is shown at the top right:
4445

45-
<img src="images/public-web-site-login-username.png" alt="public web site login username" class="img-thumbnail" width="256" height="140" />
46+
<img src="images/public-web-site-login-username.png" alt="public web site login username" class="img-thumbnail" />
4647

47-
To make this working, public web site must know URL of Angular app. This is configured in the **appsettings.json** of the **Web.Public** project, set **AdminWebSiteRootAddress** to root URL of the main application.
48+
To make this working, public web site must know URL of app. This is configured in the **appsettings.json** of the **Web.Public** project, set **AdminWebSiteRootAddress** to root URL of the main application.
4849

4950
This configuration is properly set for the development environment. You should change it when you publish your project.

docs/en/images/frontend-homepage.jpg

-37 KB
Binary file not shown.

docs/en/images/frontend-homepage.png

183 KB
Loading
5.8 KB
Loading
81.4 KB
Loading
Loading
Loading
70.1 KB
Loading
57 Bytes
Loading

docs/en/images/tenant-signup-v4.png

45.7 KB
Loading

0 commit comments

Comments
 (0)