Merge branch 'develop' into single-server
# Conflicts: # app.json # app/index.js
No related branches found
No related tags found
Showing
- README.md 25 additions, 29 deletionsREADME.md
- __mocks__/react-native-localize.js 2 additions, 0 deletions__mocks__/react-native-localize.js
- __mocks__/react-native-realm-path.js 3 additions, 0 deletions__mocks__/react-native-realm-path.js
- __tests__/__snapshots__/Storyshots.test.js.snap 2498 additions, 2386 deletions__tests__/__snapshots__/Storyshots.test.js.snap
- android/app/build.gradle 5 additions, 2 deletionsandroid/app/build.gradle
- android/app/src/main/AndroidManifest.xml 16 additions, 0 deletionsandroid/app/src/main/AndroidManifest.xml
- android/app/src/main/java/chat/rocket/reactnative/MainApplication.java 8 additions, 2 deletions...rc/main/java/chat/rocket/reactnative/MainApplication.java
- android/app/src/main/java/chat/rocket/reactnative/share/ShareActivity.java 23 additions, 0 deletions...ain/java/chat/rocket/reactnative/share/ShareActivity.java
- android/app/src/main/java/chat/rocket/reactnative/share/ShareApplication.java 38 additions, 0 deletions.../java/chat/rocket/reactnative/share/ShareApplication.java
- android/app/src/main/res/values/strings.xml 1 addition, 1 deletionandroid/app/src/main/res/values/strings.xml
- android/app/src/main/res/values/styles.xml 15 additions, 0 deletionsandroid/app/src/main/res/values/styles.xml
- android/settings.gradle 9 additions, 3 deletionsandroid/settings.gradle
- app.json 1 addition, 0 deletionsapp.json
- app/actions/actionsTypes.js 5 additions, 0 deletionsapp/actions/actionsTypes.js
- app/actions/share.js 15 additions, 0 deletionsapp/actions/share.js
- app/constants/settings.js 6 additions, 0 deletionsapp/constants/settings.js
- app/containers/HeaderButton.js 14 additions, 0 deletionsapp/containers/HeaderButton.js
- app/containers/MessageActions.js 6 additions, 5 deletionsapp/containers/MessageActions.js
- app/containers/MessageBox/UploadModal.js 155 additions, 24 deletionsapp/containers/MessageBox/UploadModal.js
- app/containers/MessageBox/index.js 85 additions, 22 deletionsapp/containers/MessageBox/index.js
Loading
Please register or sign in to comment