Merge beta into master (#1461)

RocketChat · Dec 11, 2019 · 13da75e · 13da75e
1 parent 0f3cdda
commit 13da75e
Show file tree

Hide file tree

Showing 478 changed files with 29,204 additions and 21,987 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
 
   e2e-test:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.2.1"
 
     environment:
       BASH_ENV: "~/.nvm/nvm.sh"
@@ -223,7 +223,7 @@ jobs:
 
   ios-build:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.2.1"
 
     environment:
       BASH_ENV: "~/.nvm/nvm.sh"
@@ -257,7 +257,8 @@ jobs:
       - run:
           name: Update Fastlane
           command: |
-            sudo bundle install
+            echo "ruby-2.6.4" > ~/.ruby-version
+            bundle install
           working_directory: ios
 
       - run:
@@ -319,7 +320,7 @@ jobs:
 
   ios-testflight:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.2.1"
 
     steps:
       - checkout
@@ -334,7 +335,8 @@ jobs:
       - run:
           name: Update Fastlane
           command: |
-            sudo bundle install
+            echo "ruby-2.4" > ~/.ruby-version
+            bundle install
           working_directory: ios
 
       - run:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
 	"settings": {
     "import/resolver": {
       "node": {
-        "extensions": [".js", ".ios.js", ".android.js"]
+        "extensions": [".js", ".ios.js", ".android.js", ".native.js", ".tsx"]
       }
     }
   },

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Readme will guide you on how to config.
 ## Features
 | Feature                                                   	    | Status 	|
 |---------------------------------------------------------------	|--------	|
-| Jitsi Integration                                             	| ❌    	|
+| Jitsi Integration                                             	| ✅    	|
 | Federation (Directory)                                        	| ✅    	|
 | Discussions                                                     | ❌    	|
 | Threads                                                       	| ✅    	|
@@ -98,11 +98,11 @@ Readme will guide you on how to config.
 | Unread counter banner on message list                         	| ✅    	|
 | E2E Encryption                                                 	| ❌    	|
 | Join a Protected Room                                         	| ❌    	|
-| Optional Analytics                                            	| ❌    	|
+| Optional Analytics                                            	| ✅    	|
 | Settings -> About us                                          	| ❌    	|
 | Settings -> Contact us                                        	| ✅    	|
 | Settings -> Update App Icon                                   	| ❌    	|
-| Settings -> Share                                             	| ❌    	|
+| Settings -> Share                                             	| ✅    	|
 | Accessibility (Medium)                                        	| ❌    	|
 | Accessibility (Advanced)                                      	| ❌    	|
 | Authentication via Meteor                                     	| ❌    	|

diff --git a/__mocks__/react-native-device-info.js b/__mocks__/react-native-device-info.js
@@ -1,5 +1,6 @@
 export default {
 	getModel: () => '',
 	getReadableVersion: () => '',
-	getBundleId: () => ''
+	getBundleId: () => '',
+	isTablet: () => false
 };