Skip to content

Commit ff959cc

Browse files
muhsin-kmuhsin-k
committed
Merge branch 'release/1.7.0'
2 parents 1f42e1e + 1bf379e commit ff959cc

File tree

240 files changed

+17748
-3887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+17748
-3887
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ orbs:
55
jobs:
66
build-and-test:
77
docker:
8-
- image: circleci/node:12.22.0
8+
- image: circleci/node:14.15.0
99
steps:
1010
- checkout
1111
- restore_cache:

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

‎.eslintrc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module.exports = {
55
rules: {
66
'no-console': 2,
77
'react/prop-types': 2,
8-
'prettier/prettier': 'off',
98
radix: 'off',
109
},
1110
};

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ ios/GoogleService-Info.plist
8080
sentry.js
8181
ios/sentry.properties
8282
android/sentry.properties
83+
84+
GoogleService-Info.plist

‎.husky/pre-commit‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
yarn lint
5+
yarn test

‎.vscode/extensions.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"recommendations": [
3+
// Spell check
4+
"streetsidesoftware.code-spell-checker",
5+
// Better Comments
6+
"aaron-bond.better-comments",
7+
// Path Autocomplete
8+
"ionutvmi.path-autocomplete",
9+
// Eslint
10+
"dbaeumer.vscode-eslint",
11+
// Auto Close Tag
12+
"formulahendry.auto-close-tag",
13+
// Auto Rename Tag
14+
"formulahendry.auto-rename-tag",
15+
// Hight light colors
16+
"naumovs.color-highlight",
17+
// GitLens
18+
"eamodio.gitlens",
19+
// Prettier
20+
"esbenp.prettier-vscode",
21+
// Dot Env
22+
"mikestead.dotenv"
23+
]
24+
}
25+

‎.vscode/settings.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"cSpell.words": [
3+
"Chatwoot",
4+
"linkify",
5+
"markdownit",
6+
"middlewares",
7+
"persistor",
8+
"Pressable",
9+
"reduxjs",
10+
"Swipeable"
11+
]
12+
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<img src="https://img.shields.io/discord/647412545203994635" alt="Discord">
1414
<a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/badge/chat-Discord-violet?logo=discord" alt="Chat on Discord"></a>
1515
<a href="http://makeapullrequest.com"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="Chat on Discord"></a>
16-
<img src="https://img.shields.io/github/license/chatwoot/chatwoot" alt="License">
16+
<img src="https://img.shields.io/github/license/chatwoot/chatwoot-mobile-app" alt="License">
1717
</p>
1818

1919
- **Supported Chatwoot version:** 2.0.0+

‎__mocks__/react-native-snackbar.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
show: jest.fn(),
3+
};

‎__tests__/App-test.js‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)