Merge branch '1.0' into HEAD

uvdesk · Feb 12, 2020 · b3743ca · b3743ca
2 parents 42a3ea9 + 504cdd8
commit b3743ca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/.github/ISSUE_TEPLATES/Bug_report.md → .github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEPLATES/Bug_report.md → .github/ISSUE_TEMPLATE/Bug_report.md
@@ -14,4 +14,4 @@ about: Report errors and problems
 <!--- Optional: only if you have suggestions on a fix/reason for the bug -->
 
 **Additional context**  
-<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
+<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
diff --git a/.github/ISSUE_TEPLATES/Feature_request.md → .github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEPLATES/Feature_request.md → .github/ISSUE_TEMPLATE/Feature_request.md
@@ -9,4 +9,4 @@ about: RFC and ideas for new features and improvements
 
 **Example**  
 <!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
-     If the new feature changes an existing feature, include a simple before/after comparison. -->
+     If the new feature changes an existing feature, include a simple before/after comparison. -->
diff --git a/.github/ISSUE_TEPLATES/Support_question.md → .github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEPLATES/Support_question.md → .github/ISSUE_TEMPLATE/Support_question.md
@@ -10,4 +10,4 @@ We use GitHub issues only to discuss about uvdesk bugs and new features. For cus
 - Visit official support website (https://support.uvdesk.com/en/)
 - Visit our community forums (https://forums.uvdesk.com)
 
-Thanks!
+Thanks!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,4 +8,4 @@ Thank you for contributing to UVDesk! Please fill out this description template
 ### 2. What does this change do, exactly?
 
 
-### 3. Please link to the relevant issues (if any).
+### 3. Please link to the relevant issues (if any).
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -5,4 +5,4 @@ Security Policy
 
 If you have found a security issue in Uvdesk, please send the details to support@uvdesk.com and don't disclose it publicly until we can provide a fix for it.
 
-Thanks!
+Thanks!
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -3,6 +3,11 @@ CHANGELOG for 1.0.x
 
 This changelog references any relevant changes introduced in 1.0 minor versions.
 
+* 1.0.4 (2020-02-12)
+    * **Misc. Updates:**
+        * Included Github issue templates.
+        * Made default article text color equals to black.
+
 * 1.0.3 (2019-11-15)
     * **Issue #24:** Customer can view other customers ticket just by passing ticket id in url
     * **Issue #94:** Knowledgebase folders not displaying correct thumbnail

diff --git a/Fixtures/KnowledgebaseWebsite.php b/Fixtures/KnowledgebaseWebsite.php
@@ -14,12 +14,12 @@ class KnowledgebaseWebsite extends DoctrineFixture
         'brand_color' => '#7E91F0',
         'page_background_color' => '#FFFFFF',
         'header_background_color' => '#FFFFFF',
-        'banner_background_color' => '#7085F4',
+        'banner_background_color' => '#7C70F4',
         'nav_text_color' => '#7085F4',
         'nav_active_color' => '#7085F4',
-        'page_link_color' => '#7085F4',
-        'page_link_hover_color' => '#7085F4',
-        'article_text_color' => '#7085F4',
+        'page_link_color' => '#2750C4',
+        'page_link_hover_color' => '#2750C4',
+        'article_text_color' => '#333333',
         'site_description' => 'Hi! how can i help you.',
         'broadcast_message' => null,
         'ticket_create_option' => true,
-Original file line number
+Diff line change
@@ Expand Up @@
     - Visit official support website (https://support.uvdesk.com/en/)
     - Visit our community forums (https://forums.uvdesk.com)
-    Thanks!
+    Thanks!
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ Thank you for contributing to UVDesk! Please fill out this description template
		### 2. What does this change do, exactly?


		### 3. Please link to the relevant issues (if any).
		### 3. Please link to the relevant issues (if any).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@ Security Policy

		If you have found a security issue in Uvdesk, please send the details to support@uvdesk.com and don't disclose it publicly until we can provide a fix for it.

		Thanks!
		Thanks!