Skip to content

Commit

Permalink
Resolved conflcits.
Browse files Browse the repository at this point in the history
  • Loading branch information
amit-webkul committed Dec 20, 2024
2 parents c1eb53a + f31aa8c commit 4568223
Show file tree
Hide file tree
Showing 62 changed files with 5,767 additions and 1,169 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ["8.1"]
php-versions: ["8.3", "8.2"]
name: PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-system }}

services:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
operating-systems: [ubuntu-latest]
php-versions: ['8.1']
php-versions: ['8.3', '8.2']

name: PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-systems }}

Expand All @@ -19,4 +19,4 @@ jobs:
uses: aglipanci/laravel-pint-action@2.0.0
with:
testMode: true
verboseMode: true
verboseMode: true
70 changes: 70 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,73 @@
## **v2.0.4 (19th of December 2024)** - *Release*

Added support for Brazilian Portuguese (PT_BR) Language.

* #1727[fixed] Fix: vulnerability issues.

* #1713[fixed] Refactor the datagrid.

* #1712[fixed] Fix the lead mass update action.

* #1711[fixed] Fix tinymce dark mode more button ui.

* #1710[fixed] Fix sidebar border on rtl.

* #1708[fixed] Fix translation of arabic and publish build as missing assets.

* #1705[fixed] Update mass-update method

* #1702[fixed] Fix users index page console error, ui and refactor code.

* #1687[fixed] Need to add correct translation for the Sources text in Settings section.

* #1690[fixed] Compose Mail, Mail To Entry issue is appearing. This issue is appearing in almost all mail related section.

* #1687[fixed] Need to add correct translation for the Sources text in Settings section.

* #1686[fixed] remove dark mode from sessions pages.

* #1676[fixed] Translation issue at webform.

* #1683[fixed] Update installation link for docker.

* #1673[fixed] Update composer for development phase.

* #1673[fixed] Add missing translation.

* #1668[fixed] Activities datagrid total counts.

* #1663[fixed] Numerical Validation Filed is appearing Empty in Attribute Text Field Validation.

* #1664[fixed] Fix format date and after validation.

* #1662[fixed] fix datagrid shimmers.

* #1660[fixed] In Attribute Filter, there we can enhance the filter in drop-down.

* #1658[fixed] Entity Type must be clickable and should work and filter just like other options in Attributes Settings.

* #1655[fixed] Getting issue in the warehouse view when we add unwanted String in the Description.

* #1653[fixed] fix div can not be child of p.

* #1650[fixed] fix lead kanban sort order issue.

* #1643[fixed] Missing translation.

* #1642[fixed] Fix activities mass action destroy.

* #1640[fixed] Need to Correct translation on Configuration Locale Settings.

* #1639[fixed] Fix Errors blade file.

* #1637[fixed] Datagrid checkbox.

* #1636[fixed] Quote pdf download error fix.

* #1594[fixed] Stage Sorting in Pipeline not working - Krayin CRM Version.

* #1594[fixed] Stage Sorting in Pipeline not working - Krayin CRM Version.

## **v2.0.2 (24th of September 2024)** - *Release*

* #1633[enhancement] Use variable instead of calling every time of use db table prefix.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
2. [Documentation](#documentation)
3. [Requirements](#requirements)
4. [Installation & Configuration](#installation-and-configuration)
4. [Docker Installation](https://devdocs.krayincrm.com/2.0/introduction/docker.html)
5. [License](#license)
6. [Security Vulnerabilities](#security-vulnerabilities)

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"license": "MIT",
"require": {
"php": "^8.1",
"php": "^8.2",
"barryvdh/laravel-dompdf": "^2.0.0",
"diglactic/laravel-breadcrumbs": "^8.0",
"doctrine/dbal": "^3.0",
Expand Down
Loading

0 comments on commit 4568223

Please sign in to comment.