Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/abpframework/abp into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ebicoglu committed Sep 20, 2024
2 parents 4cb2585 + 8f088c3 commit 3a62158
Show file tree
Hide file tree
Showing 19 changed files with 636 additions and 455 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"CreatePostCoverInfo1": "<i class='bi bi-dot'></i> Accepted file types : <strong>JPEG, JPG, PNG</strong>",
"CreatePostCoverInfo2": "<i class='bi bi-dot'></i> Max file size : <strong>1 MB</strong>",
"CreatePostCoverInfo3": "<i class='bi bi-dot'></i> Image proportion : <strong>16:9</strong>",
"CreatePostCoverInfo4": "<i class='bi bi-dot'></i> <a href='https://abp.io/assets/example-post-image.png'> Download a sample cover image </a>",
"CreatePostCoverInfo4": "<i class='bi bi-dot'></i> <a href='/assets/example-post-image.png' download> Download a sample cover image </a>",
"ThisExtensionIsNotAllowed": "This extension is not allowed.",
"TheFileIsTooLarge": "The file is too large.",
"GoToThePost": "Go to the Post",
Expand Down Expand Up @@ -977,6 +977,8 @@
"UISupportExplanation": "ABP Framework itself is UI framework agnostic and can work with any UI framework. However, startup templates, module UIs and themes were not implemented for all UI frameworks. Check out the <a href=\"{0}\">Getting Started document</a> for the up-to-date list of UI options.",
"MicroserviceSupport": "Does it support the microservice architecture?",
"WhereCanIDownloadSourceCode": "Where can I download the source-code?",
"HowCanIUpgradeMyProjectToCommercialTemplate": "How can I upgrade my open-source project to the commercial PRO templates?",
"HowCanIUpgradeMyProjectToCommercialExplanation": "You can check out our documentation at <a href=\"{0}\">Migrating from open source templates</a> to upgrade your open-source projects to the paid PRO templates.",
"ComputerLimitation": "How many computers can a developer login when developing ABP?",
"ComputerLimitationExplanation": "We specifically permit <strong>{0} computers</strong> per individual/licensed developer. Whenever there is a need for a developer to develop ABP based products on a third machine, an e-mail should be sent to license@abp.io explaining the situation, and we will then make the appropriate allocation in our system.",
"RefundPolicy": "Do you have a refund policy?",
Expand Down
10 changes: 9 additions & 1 deletion docs/en/docs-nav.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,16 @@
"path": "tutorials/modular-crm/part-05.md"
},
{
"text": "6: Integrating the modules",
"text": "6: Integrating the modules: Implementing Integration Services",
"path": "tutorials/modular-crm/part-06.md"
},
{
"text": "7: Integrating the modules: Communication via Messages (Events)",
"path": "tutorials/modular-crm/part-07.md"
},
{
"text": "8: Integrating the modules: Joining the Products and Orders Data",
"path": "tutorials/modular-crm/part-08.md"
}
]
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions docs/en/framework/ui/angular/modal.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,59 @@ The modal with form looks like this:

**`options`** is an input typed [NgbModalOptions](https://ng-bootstrap.github.io/#/components/modal/api#NgbModalOptions). It is configuration for the `ng-bootstrap` modal.


**Examples:**

- `animation`: This is an NgbModalOption property of type *boolean*. It controls whether the modal opens and closes with an animation. By default, it is set to true, meaning that the modal will have a smooth transition when it opens and closes. Setting it to false will disable these animations.

```js
import { Component } from '@angular/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';

@Component({
selector: 'ngbd-modal-options',
...})

export class NgbdModalOptions {
modalService = inject(NgbModal);
animationModal(content) {
this.modalService.open(content, { animation: true });
}
}
```

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; The result of this configuration would be like this:

![Modal example result](./images/animation-true.gif)

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On the contrary, if we set it as false:

![Modal example result](./images/animation-false.gif)


- `fullscreen`: This is an NgbModalOption property of type *boolean or string*. When set to `true`, the element will expand to cover the entire screen, hiding all other interface elements. When set to `false`, the element remains in its regular size and position within the page.

```js
import { Component } from '@angular/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';

@Component({
selector: 'ngbd-modal-options',
...})

export class NgbdModalOptions {
modalService = inject(NgbModal);
fullscreenModal(content) {
this.modalService.open(content, { fullscreen: true });
}
}

```

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; If `fullscreen: true`:

![Modal example result](./images/fullscreen-true.png)

#### suppressUnsavedChangesWarning

```js
Expand Down
7 changes: 7 additions & 0 deletions docs/en/studio/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This document contains **brief release notes** for each ABP Studio release. Release notes only include **major features** and **visible enhancements**. Therefore, they don't include all the development done in the related version.

## 0.8.2 (2024-09-19)

* Fixed WireGuard connection random port bug
* Automated steps after microservice solution creation
* Fixed unusable options/features for Trial License
* Fixed blazor-server single-layer template

## 0.8.1 (2024-09-12)

* Fixed MySQL connection problem for nolayers template
Expand Down
2 changes: 1 addition & 1 deletion docs/en/studio/version-compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This document provides an overview of the compatibility between various versions

| **ABP Studio Version** | **ABP Version** |
|------------------------|---------------------------|
| 0.8.1 | 8.3.0 |
| 0.8.1 - 0.8.2 | 8.3.0 |
| 0.8.0 | 8.2.3 |
| 0.7.8 - 0.7.9 | 8.2.2 |
| 0.7.4 to 0.7.7 | 8.2.1 |
Expand Down
4 changes: 3 additions & 1 deletion docs/en/tutorials/modular-crm/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ This tutorial is organized as the following parts:
* [Part 03: Building the Products module](part-03.md)
* [Part 04: Creating the initial Ordering module](part-04.md)
* [Part 05: Building the Ordering module](part-05.md)
* [Part 06: Integrating the modules](part-06.md)
* [Part 06: Integrating the modules: Implementing Integration Services](part-06.md)
* [Part 07: Integrating the modules: Communication via Messages (Events)](part-07.md)
* [Part 08: Integrating the modules: Joining the Products and Orders Data](part-08.md)

## Download the Source Code

Expand Down
2 changes: 1 addition & 1 deletion docs/en/tutorials/modular-crm/part-05.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Path": "tutorials/modular-crm/part-04"
},
"Next": {
"Name": "Integrating Modules",
"Name": "Integrating Modules: Implementing Integration Services",
"Path": "tutorials/modular-crm/part-06"
}
}
Expand Down
Loading

0 comments on commit 3a62158

Please sign in to comment.