resolved: resolved conflicts.

krayin · Dec 5, 2024 · 5fb20c1 · 5fb20c1
2 parents 8a4dcc2 + efa9b87
commit 5fb20c1
Show file tree

Hide file tree

Showing 233 changed files with 5,991 additions and 2,873 deletions.
diff --git a/.env.example b/.env.example
@@ -5,6 +5,7 @@ APP_DEBUG=true
 APP_URL=http://localhost
 APP_TIMEZONE=Asia/Kolkata
 APP_LOCALE=en
+APP_CURRENCY=USD
 
 VITE_HOST=
 VITE_PORT=

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,26 @@
-## **v2.0.2 (13th of September 2024)** - *Release*
+## **v2.0.2 (24th of September 2024)** - *Release*
+
+* #1633[enhancement] Use variable instead of calling every time of use db table prefix.
+
+* #1621[enhancement] Person view page refactor.
+
+* #1632[fixed] Update mail view render event.
+
+* #1631[fixed] Dark Mode UI.
+
+* #1629[fixed] Activities participants dark mode ui fixed.
+
+* #1628[fixed] Refactor the quotes edit and create page.
+
+* #1627[fixed] Leads actions ui.
+
+* #1626[fixed] Mail View Page Refactor
+
+* #1625[fixed] Sidebar rounded menu fix in rtl view.
+
+* #1619[fixed] Persons view page avatar and organization edit button.
+
+* #1617[fixed] When Printing to pdf, currency Symbol gets printed with ? instead of the Symbol.
 
 * #1603[fixed] Bug: Page resets when entering the first character in "URL And Parameters" while creating a Webhook on mobile.
 

diff --git a/README.md b/README.md
@@ -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)
 
@@ -123,8 +124,8 @@ password:admin123
 
 ### License
 
-Krayin CRM is a truly opensource CRM framework which will always be free under the [MIT License](https://github.com/krayin/laravel-crm/blob/master/LICENSE).
+Krayin CRM is a truly opensource CRM framework which will always be free under the [OSL-3.0 License](https://github.com/krayin/laravel-crm/blob/master/LICENSE.txt).
 
 ### Security Vulnerabilities
 
-Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in Krayin CRM then please email us: mailto:[email protected].
+Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in Krayin CRM then please email us: [email protected].
diff --git a/composer.json b/composer.json
@@ -79,6 +79,13 @@
             "Tests\\": "tests/"
         }
     },
+    "repositories": [{
+        "type": "path",
+        "url": "packages/*/*",
+        "options": {
+            "symlink": true
+        }
+    }],
     "minimum-stability": "stable",
     "prefer-stable": true,
     "scripts": {