Browse Source

Merge pull request #17937 from abpframework/auto-merge/rel-7-4/2240

Merge branch dev with rel-7.4
pull/17956/head
Masum ULU 3 years ago
committed by GitHub
parent
commit
38cb983410
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      docs/en/Getting-Started-Running-Solution-Single-Layer.md
  2. 4
      docs/en/Getting-Started-Running-Solution.md
  3. 10
      docs/en/Modules/Cms-Kit/Pages.md
  4. 2
      docs/en/Tutorials/Part-1.md
  5. 2
      docs/en/Tutorials/Todo/Index.md
  6. 2
      docs/en/Tutorials/Todo/Single-Layer/Index.md
  7. BIN
      docs/en/images/cmskit-module-pages-page.png
  8. 2
      npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts

2
docs/en/Getting-Started-Running-Solution-Single-Layer.md

@ -66,7 +66,7 @@ abp install-libs
> We suggest you install [Yarn](https://classic.yarnpkg.com/) to prevent possible package inconsistencies, if you haven't installed it yet.
{{if UI=="Blazor" || UI="BlazorServer"}}
{{if UI=="Blazor" || UI=="BlazorServer"}}
### Bundling and Minification

4
docs/en/Getting-Started-Running-Solution.md

@ -105,7 +105,7 @@ abp install-libs
> We suggest you install [Yarn](https://classic.yarnpkg.com/) to prevent possible package inconsistencies, if you haven't installed it yet.
{{if UI=="Blazor" || UI="BlazorServer"}}
{{if UI=="Blazor" || UI=="BlazorServer"}}
### Bundling and Minification
@ -125,6 +125,8 @@ abp bundle
{{ if UI == "MVC" || UI == "BlazorServer" }}
> **Note**: Before starting the application, run `abp install-libs` command in your Web directory to restore the client-side libraries. This will populate the `libs` folder.
{{ if Tiered == "Yes" }}
> Tiered solutions use **Redis** as the distributed cache. Ensure that it is installed and running in your local computer. If you are using a remote Redis Server, set the configuration in the `appsettings.json` files of the projects below.

10
docs/en/Modules/Cms-Kit/Pages.md

@ -22,13 +22,13 @@ CMS Kit module admin side adds the following items to the main menu, under the *
#### Page Management
Pages page is used to manage dynamic pages in the system.
**Pages** page is used to manage dynamic pages in the system. You can create/edit pages with dynamic routes and contents on this page:
![pages-page](../../images/cmskit-module-pages-page.png)
![pages-edit](../../images/cmskit-module-pages-edit.png)
You can create or edit an existing page on this page.
After you have created pages, you can set one of them as a *home page*. Then, whenever anyone navigates to your application's homepage, they see the dynamic content of the page that you have defined on this page.
![pages-edit](../../images/cmskit-module-pages-edit.png)
![pages-page](../../images/cmskit-module-pages-page.png)
When you create a page, you can access the created page via `/{slug}` URL.
Also when you create a page, you can access the created page via `/{slug}` URL.

2
docs/en/Tutorials/Part-1.md

@ -66,7 +66,7 @@ abp install-libs
> We suggest you install [Yarn](https://classic.yarnpkg.com/) to prevent possible package inconsistencies, if you haven't installed it yet.
{{if UI=="Blazor" || UI="BlazorServer"}}
{{if UI=="Blazor" || UI=="BlazorServer"}}
### Bundling and Minification

2
docs/en/Tutorials/Todo/Index.md

@ -113,7 +113,7 @@ abp install-libs
> We suggest you install [Yarn](https://classic.yarnpkg.com/) to prevent possible package inconsistencies, if you haven't installed it yet.
{{if UI=="Blazor" || UI="BlazorServer"}}
{{if UI=="Blazor" || UI=="BlazorServer"}}
#### Bundling and Minification

2
docs/en/Tutorials/Todo/Single-Layer/Index.md

@ -117,7 +117,7 @@ abp install-libs
> We suggest you install [Yarn](https://classic.yarnpkg.com/) to prevent possible package inconsistencies, if you haven't installed it yet.
{{if UI=="Blazor" || UI="BlazorServer"}}
{{if UI=="Blazor" || UI=="BlazorServer"}}
#### Bundling and Minification

BIN
docs/en/images/cmskit-module-pages-page.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB

2
npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts

@ -21,7 +21,7 @@ export class TrackCapsLockDirective {
if (
(s.toUpperCase() === s && s.toLowerCase() !== s && e.shiftKey) ||
(s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey) ||
e.getModifierState('CapsLock')
(e.getModifierState && e.getModifierState('CapsLock'))
) {
return true;
}

Loading…
Cancel
Save