Merge branch 'release/1.4.0'

Author: muhsin-k

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 jobs:
   build-and-test:
     docker:
-      - image: circleci/node:12.5.0
+      - image: circleci/node:12.22.0
     steps:
       - checkout
       - restore_cache:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Bug'
+assignees: ''
+
+---
+
+Confirm you’re filing a new issue. [Search issues in Github](https://github.com/chatwoot/chatwoot-mobile-app/issues) and ensure that the issue is not already exist.
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+
+**To Reproduce**
+
+How can we reproduce the issue
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Observed behavior**
+
+What did you see happen? Please include relevant error messages, screenshots and/or video recordings.
+
+**Environment**
+
+  - Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self hosted installation of Chatwoot.
+  - Device Name:  [e.g. iPhone6]
+  - OS Version: [e.g. iOS8.1]
+  - Chatwoot App Version: [e.g. 1.2.0]
+  - Chatwoot Server Version: [e.g. 1.16.0]
+
+**Additional context**
+
+Add any other context about the problem here.
+
+**Possible fixes**
+
+If you can, link to the line of code that might be responsible for the problem

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -0,0 +1,20 @@
+---
+name: Enhancement request
+about: Suggest any enhancements for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your enhancement request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions you've considered.
+
+**Additional context**
+Add any other context or screenshots about the enhancement request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,30 @@
+# Pull Request Template
+
+## Description 
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+
+## Checklist:
+
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented on my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] I have tested in both Android and iOS platform
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules

.gitignore

@@ -6,6 +6,7 @@
 # Xcode
 #
 build/
+ios/builds/
 *.pbxuser
 !default.pbxuser
 *.mode1v3

README.md

@@ -16,7 +16,7 @@
  <img src="https://img.shields.io/github/license/chatwoot/chatwoot" alt="License">
 </p>
 
-- **Supported Chatwoot version:** 1.15+
+- **Supported Chatwoot version:** 2.0.0+
 - **Supported iOS versions**: 11+ 
 - **Supported Android versions**: 5.0+
 
@@ -51,6 +51,19 @@
   </a>
 </p>
 
+## Testing
+
+To help with testing app updates before they're released, you can:
+
+Sign up to be a beta tester
+
+   - [Android](https://play.google.com/apps/testing/com.chatwoot.app) -  Open this link from your Android device
+   - [iOS](https://testflight.apple.com/join/ji5H8iSJ) - Open this link from your iOS device
+   
+You can leave the Beta testing program at any time:
+- On Android, [click this link](https://play.google.com/apps/testing/com.chatwoot.app) while logged in with your Google Play email address used to opt-in for the Beta program, then click **Leave the program**. 
+- On iOS, access the `Chatwoot` app page in TestFlight and click **Stop Testing**.
+
 ## Feedback & Contributing
 
 Feel free to send us feedback on [Twitter](https://twitter.com/chatwootapp) or [file an issue](https://github.com/chatwoot/chatwoot-mobile-app/issues).
@@ -61,4 +74,4 @@ If you want to self deploy the Chatwoot mobile app, please take a look at the [C
 
 If there's anything you'd like to chat about, please feel free to join our [Discord](https://discord.gg/cJXdrwS) chat!
 
-_Chatwoot_ &copy; 2017-2021, Chatwoot Inc - Released under the MIT License.
+_Chatwoot_ &copy; 2017-2022, Chatwoot Inc - Released under the MIT License.

SECURITY.md

@@ -0,0 +1,31 @@
+# Security Policy
+Chatwoot is looking forward to working with security researchers across the world to keep Chatwoot and our users safe. If you have found an issue in our systems/applications, please reach out to us.
+
+## Reporting a Vulnerability
+
+We use [huntr.dev](https://huntr.dev/) for security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://huntr.dev/bounties/disclose). 
+
+This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts.
+
+If you have any questions about the process, feel free to reach out to [email protected].
+
+
+## Out of scope
+
+Please do not perform testing against Chatwoot production services. Use a self hosted instance to perform tests.
+
+We consider the following to be out of scope, though there may be exceptions.
+
+- Missing HTTP security headers
+- Self XSS
+- HTTP Host Header XSS without working proof-of-concept
+- Incomplete/Missing SPF/DKIM
+- Denial of Service attacks
+- DNSSEC
+- Social Engineering attacks
+
+If you are not sure about the scope, please create a report.
+
+## Thanks
+
+Thank you for keeping Chatwoot and our users safe. 🙇

android/app/build.gradle

@@ -136,8 +136,8 @@ android {
         applicationId "com.chatwoot.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5003
-        versionName "1.3.0"
+        versionCode 5028
+        versionName "1.4.0"
         multiDexEnabled true 
     }
     splits {

android/app/proguard-rules.pro

@@ -9,4 +9,5 @@
 
 # Add any project specific keep options here:
 -keep class com.facebook.jni.** { *; }
--keep public class com.horcrux.svg.** {*;}
+-keep public class com.horcrux.svg.** {*;}
+-keep class com.chatwoot.app.BuildConfig { *; }