-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Merge 4.13.1 into master #2773
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Merge 4.13.1 into master #2773
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* [WIP] Use rest instead methodCall * [WIP] Some method calls using wrapper * [WIP] Wrap all necessary methodCalls * fix Co-authored-by: Diego Mello <[email protected]>
* [IMPROVEMENT] Mark a thread as read * Use methodCallWrapper * Check server version Co-authored-by: Diego Mello <[email protected]>
… properties (#2232) Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* [NEW] MessageBox: Expo-av audio recorder * Refactor MessageBox to accommodate recording button even when recording * Rename Recording.js -> RecordAudio.js as we could implement video recording in the future * RecordAudio: Introduce cancel and send buttons * RecordAudio: Introduce recorderBusy state, refactor MessageBox, remove useless SafeAreaView * RecordAudio: Better audio quality 🎉, stop recording on unmount * RecordAudio: Use FileSystem from expo-file-system instead of RNFetchBlob * chore: flush out react-native-audio * fix(MessageBox): bring back some missed styles during refactor * refactor(RecordAudio): use class component * refactor(RecordAudio): recorder busy to class property, styling changes * recorder initialisation changes * fix(RecordAudio): missing await in isRecordingPermissionGranted * fix(RecordAudio): set isRecording = false on cancel/finish, refactor perms Co-authored-by: Diego Mello <[email protected]>
* Change drawer icon * Removed iOS variation * Patch to react-navigation-header-buttons... easier to patch then to overwrite its behaviour :( * Correctly position title * Header subtitle * Layout * Alignment * RoomView header * Renamed RoomHeaderLeft to LeftButtons * RoomView back button * Search icon on RoomView * Refactor * Fix header on tablet * Fix search messages close button on tablet * Search key command * Network status on RoomView header subtitle * Update tests * Scale content * SearchBox cancel color
Co-authored-by: Diego Mello <[email protected]>
… Share Extension (#2251)
* [FIX] Check if exists scroll ref * Remove scrollTo Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
#2255) Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* [FIX] Zoomed in images must react to gestures * AnimatedFastImage -> AnimatedImage Co-authored-by: Diego Mello <[email protected]>
* [FIX] Action sheet cutting emojis on the header * fix tablet case Co-authored-by: Djorkaeff Alexandre <[email protected]>
* Arabic language setup * Added arabic translation * Arabic translation Proofreading Co-authored-by: Diego Mello <[email protected]>
* feat(i18n): add some missing strings and improve some translation * fix: add missing server version Co-authored-by: Diego Mello <[email protected]>
* 1689 - missing user name for status messages * 1689 - missing user name for status messages. Fixed broken e2e test "should pin message". * Minor tweak * Remove center style * Small refactor on User * Remove toLowerCase * Update tests Co-authored-by: Diego Mello <[email protected]>
* fix: filename on react-native-image-crop-picker * fix: use rn-fetch-blob to upload files * fix: FileUpload as a service * fix: cancel upload on iOS * fix: file upload from share extension Co-authored-by: Diego Mello <[email protected]>
* improve white labelling for Android * Move application ID to gradle properties * Fix CI * Point foss sufix to main app * Use npx on android-whitelabel script Co-authored-by: Diego Mello <[email protected]>
* Persist highest value on subscription.roomUpdatedAt * Update tests Co-authored-by: Djorkaeff Alexandre <[email protected]>
* Fix main jitsi * Fix iOS * Clear build.gradle cache * Don't restore gradle * cache is back * Use master * Point to react-native-jitsi-meet#master
* Duplicated target and changed Bridging Header * Display name * Unnecessary dumb swift file removed * Buildable name * Reorder Info.plist * Rename Official target's bundle id * Ignore .mobileprovision * Fix provisioning of official app * Starting signing * stash fastfile * starting official ci iOS * Uncomment Fastfile keychain * Fix CI config * allowProvisioningUpdates * Changing AppIcon and Splash Screen * Remove unnecessary folder inside of Images.xcassets * Reorder notificationservice and shareextension plists * Fix signing * Manual signing style for official * Split official signing * Update project provisioning * Use ENV as profile * Output match * Keys * TestFlight refactor * Setting up android * android-official-play-build job * Start removing unnecessary fastlane tasks on Android * Trying to refactor Android jobs * android-env * Remove foss build for now * Fork * Fix if conditions * Fix push * ios-build command * Rename Android builds * Upload dSYMs * Refactoring workflow * Reorder upload-to-testflight * upload-to-google-play-beta command * Fix ci * Fix android fork build * Fix keystore * Fix options on fastlane android * Fix keystore * Check isOfficial on iOS * Check isOfficial on db * Remove unused imports * Database names on Android * Tag fix * Minor fixes * Set IS_OFFICIAL on CI * Fix detox * follow review suggestions Co-authored-by: Djorkaeff Alexandre <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Typo Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* Move build_fork to the end * Rename release to build_experimental
…es (#2726) * Remove sequential empty spaces from Markdown preview * Use Markdown preview on RepliedThread
* Update React Native to 0.63.4 * Fix multiple uploads not working on iOS
* Fix rn-fetch-blob's document dir without forward slash * Update camera roll
fixes: #2693 # Please enter the commit message for your changes. Lines starting Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
# Conflicts: # android/app/build.gradle # app/lib/methods/helpers/mergeSubscriptionsRooms.js # app/sagas/deepLinking.js # app/utils/fileUpload/index.ios.js # app/views/AttachmentView.js # ios/Podfile # ios/Podfile.lock # ios/Pods/Flipper/README.md # ios/Pods/Flipper/xplat/Flipper/ConnectionContextStore.cpp # ios/Pods/Flipper/xplat/Flipper/FlipperClient.cpp # ios/Pods/Flipper/xplat/Flipper/FlipperClient.h # ios/Pods/Flipper/xplat/Flipper/FlipperConnectionManager.h # ios/Pods/Flipper/xplat/Flipper/FlipperConnectionManagerImpl.cpp # ios/Pods/Flipper/xplat/Flipper/FlipperConnectionManagerImpl.h # ios/Pods/FlipperKit/README.md # ios/Pods/FlipperKit/iOS/FlipperKit/FlipperClient.h # ios/Pods/FlipperKit/iOS/FlipperKit/FlipperClient.mm # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKInvalidation.h # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.h # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKNodeDescriptor.mm # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.h # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTouch.m # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/UIView+SKInvalidation.mm # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKApplicationDescriptor.m # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKScrollViewDescriptor.m # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm # ios/Pods/FlipperKit/iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsSwizzleUtility.m # ios/Pods/Local Podspecs/FBLazyVector.podspec.json # ios/Pods/Local Podspecs/FBReactNativeSpec.podspec.json # ios/Pods/Local Podspecs/RCTRequired.podspec.json # ios/Pods/Local Podspecs/RCTTypeSafety.podspec.json # ios/Pods/Local Podspecs/React-Core.podspec.json # ios/Pods/Local Podspecs/React-CoreModules.podspec.json # ios/Pods/Local Podspecs/React-RCTActionSheet.podspec.json # ios/Pods/Local Podspecs/React-RCTAnimation.podspec.json # ios/Pods/Local Podspecs/React-RCTBlob.podspec.json # ios/Pods/Local Podspecs/React-RCTImage.podspec.json # ios/Pods/Local Podspecs/React-RCTLinking.podspec.json # ios/Pods/Local Podspecs/React-RCTNetwork.podspec.json # ios/Pods/Local Podspecs/React-RCTSettings.podspec.json # ios/Pods/Local Podspecs/React-RCTText.podspec.json # ios/Pods/Local Podspecs/React-RCTVibration.podspec.json # ios/Pods/Local Podspecs/React-callinvoker.podspec.json # ios/Pods/Local Podspecs/React-cxxreact.podspec.json # ios/Pods/Local Podspecs/React-jsi.podspec.json # ios/Pods/Local Podspecs/React-jsiexecutor.podspec.json # ios/Pods/Local Podspecs/React-jsinspector.podspec.json # ios/Pods/Local Podspecs/React.podspec.json # ios/Pods/Local Podspecs/ReactCommon.podspec.json # ios/Pods/Local Podspecs/Yoga.podspec.json # ios/Pods/Local Podspecs/react-native-cameraroll.podspec.json # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/BugsnagReactNative/BugsnagReactNative.debug.xcconfig # ios/Pods/Target Support Files/BugsnagReactNative/BugsnagReactNative.release.xcconfig # ios/Pods/Target Support Files/EXImageLoader/EXImageLoader.debug.xcconfig # ios/Pods/Target Support Files/EXImageLoader/EXImageLoader.release.xcconfig # ios/Pods/Target Support Files/FBReactNativeSpec/FBReactNativeSpec.debug.xcconfig # ios/Pods/Target Support Files/FBReactNativeSpec/FBReactNativeSpec.release.xcconfig # ios/Pods/Target Support Files/FlipperKit/FlipperKit-umbrella.h # ios/Pods/Target Support Files/KeyCommands/KeyCommands.debug.xcconfig # ios/Pods/Target Support Files/KeyCommands/KeyCommands.release.xcconfig # ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig # ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-resources.sh # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig # ios/Pods/Target Support Files/RCTTypeSafety/RCTTypeSafety.debug.xcconfig # ios/Pods/Target Support Files/RCTTypeSafety/RCTTypeSafety.release.xcconfig # ios/Pods/Target Support Files/RNBootSplash/RNBootSplash.debug.xcconfig # ios/Pods/Target Support Files/RNBootSplash/RNBootSplash.release.xcconfig # ios/Pods/Target Support Files/RNCAsyncStorage/RNCAsyncStorage.debug.xcconfig # ios/Pods/Target Support Files/RNCAsyncStorage/RNCAsyncStorage.release.xcconfig # ios/Pods/Target Support Files/RNCMaskedView/RNCMaskedView.debug.xcconfig # ios/Pods/Target Support Files/RNCMaskedView/RNCMaskedView.release.xcconfig # ios/Pods/Target Support Files/RNCPicker/RNCPicker.debug.xcconfig # ios/Pods/Target Support Files/RNCPicker/RNCPicker.release.xcconfig # ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.debug.xcconfig # ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.release.xcconfig # ios/Pods/Target Support Files/RNDateTimePicker/RNDateTimePicker.debug.xcconfig # ios/Pods/Target Support Files/RNDateTimePicker/RNDateTimePicker.release.xcconfig # ios/Pods/Target Support Files/RNDeviceInfo/RNDeviceInfo.debug.xcconfig # ios/Pods/Target Support Files/RNDeviceInfo/RNDeviceInfo.release.xcconfig # ios/Pods/Target Support Files/RNFBAnalytics/RNFBAnalytics.debug.xcconfig # ios/Pods/Target Support Files/RNFBAnalytics/RNFBAnalytics.release.xcconfig # ios/Pods/Target Support Files/RNFBApp/RNFBApp.debug.xcconfig # ios/Pods/Target Support Files/RNFBApp/RNFBApp.release.xcconfig # ios/Pods/Target Support Files/RNFBCrashlytics/RNFBCrashlytics.debug.xcconfig # ios/Pods/Target Support Files/RNFBCrashlytics/RNFBCrashlytics.release.xcconfig # ios/Pods/Target Support Files/RNFastImage/RNFastImage.debug.xcconfig # ios/Pods/Target Support Files/RNFastImage/RNFastImage.release.xcconfig # ios/Pods/Target Support Files/RNGestureHandler/RNGestureHandler.debug.xcconfig # ios/Pods/Target Support Files/RNGestureHandler/RNGestureHandler.release.xcconfig # ios/Pods/Target Support Files/RNImageCropPicker/RNImageCropPicker.debug.xcconfig # ios/Pods/Target Support Files/RNImageCropPicker/RNImageCropPicker.release.xcconfig # ios/Pods/Target Support Files/RNLocalize/RNLocalize.debug.xcconfig # ios/Pods/Target Support Files/RNLocalize/RNLocalize.release.xcconfig # ios/Pods/Target Support Files/RNReanimated/RNReanimated.debug.xcconfig # ios/Pods/Target Support Files/RNReanimated/RNReanimated.release.xcconfig # ios/Pods/Target Support Files/RNRootView/RNRootView.debug.xcconfig # ios/Pods/Target Support Files/RNRootView/RNRootView.release.xcconfig # ios/Pods/Target Support Files/RNScreens/RNScreens.debug.xcconfig # ios/Pods/Target Support Files/RNScreens/RNScreens.release.xcconfig # ios/Pods/Target Support Files/RNVectorIcons/RNVectorIcons.debug.xcconfig # ios/Pods/Target Support Files/RNVectorIcons/RNVectorIcons.release.xcconfig # ios/Pods/Target Support Files/React-Core/React-Core.debug.xcconfig # ios/Pods/Target Support Files/React-Core/React-Core.release.xcconfig # ios/Pods/Target Support Files/React-Core/ResourceBundle-AccessibilityResources-React-Core-Info.plist # ios/Pods/Target Support Files/React-CoreModules/React-CoreModules.debug.xcconfig # ios/Pods/Target Support Files/React-CoreModules/React-CoreModules.release.xcconfig # ios/Pods/Target Support Files/React-RCTActionSheet/React-RCTActionSheet.debug.xcconfig # ios/Pods/Target Support Files/React-RCTActionSheet/React-RCTActionSheet.release.xcconfig # ios/Pods/Target Support Files/React-RCTAnimation/React-RCTAnimation.debug.xcconfig # ios/Pods/Target Support Files/React-RCTAnimation/React-RCTAnimation.release.xcconfig # ios/Pods/Target Support Files/React-RCTBlob/React-RCTBlob.debug.xcconfig # ios/Pods/Target Support Files/React-RCTBlob/React-RCTBlob.release.xcconfig # ios/Pods/Target Support Files/React-RCTImage/React-RCTImage.debug.xcconfig # ios/Pods/Target Support Files/React-RCTImage/React-RCTImage.release.xcconfig # ios/Pods/Target Support Files/React-RCTLinking/React-RCTLinking.debug.xcconfig # ios/Pods/Target Support Files/React-RCTLinking/React-RCTLinking.release.xcconfig # ios/Pods/Target Support Files/React-RCTNetwork/React-RCTNetwork.debug.xcconfig # ios/Pods/Target Support Files/React-RCTNetwork/React-RCTNetwork.release.xcconfig # ios/Pods/Target Support Files/React-RCTSettings/React-RCTSettings.debug.xcconfig # ios/Pods/Target Support Files/React-RCTSettings/React-RCTSettings.release.xcconfig # ios/Pods/Target Support Files/React-RCTText/React-RCTText.debug.xcconfig # ios/Pods/Target Support Files/React-RCTText/React-RCTText.release.xcconfig # ios/Pods/Target Support Files/React-RCTVibration/React-RCTVibration.debug.xcconfig # ios/Pods/Target Support Files/React-RCTVibration/React-RCTVibration.release.xcconfig # ios/Pods/Target Support Files/React/React.debug.xcconfig # ios/Pods/Target Support Files/React/React.release.xcconfig # ios/Pods/Target Support Files/ReactCommon/ReactCommon.debug.xcconfig # ios/Pods/Target Support Files/ReactCommon/ReactCommon.release.xcconfig # ios/Pods/Target Support Files/ReactNativeART/ReactNativeART.debug.xcconfig # ios/Pods/Target Support Files/ReactNativeART/ReactNativeART.release.xcconfig # ios/Pods/Target Support Files/ReactNativeUiLib/ReactNativeUiLib.debug.xcconfig # ios/Pods/Target Support Files/ReactNativeUiLib/ReactNativeUiLib.release.xcconfig # ios/Pods/Target Support Files/UMReactNativeAdapter/UMReactNativeAdapter.debug.xcconfig # ios/Pods/Target Support Files/UMReactNativeAdapter/UMReactNativeAdapter.release.xcconfig # ios/Pods/Target Support Files/react-native-appearance/react-native-appearance.debug.xcconfig # ios/Pods/Target Support Files/react-native-appearance/react-native-appearance.release.xcconfig # ios/Pods/Target Support Files/react-native-background-timer/react-native-background-timer.debug.xcconfig # ios/Pods/Target Support Files/react-native-background-timer/react-native-background-timer.release.xcconfig # ios/Pods/Target Support Files/react-native-blur/react-native-blur.debug.xcconfig # ios/Pods/Target Support Files/react-native-blur/react-native-blur.release.xcconfig # ios/Pods/Target Support Files/react-native-cameraroll/react-native-cameraroll.debug.xcconfig # ios/Pods/Target Support Files/react-native-cameraroll/react-native-cameraroll.release.xcconfig # ios/Pods/Target Support Files/react-native-cookies/react-native-cookies.debug.xcconfig # ios/Pods/Target Support Files/react-native-cookies/react-native-cookies.release.xcconfig # ios/Pods/Target Support Files/react-native-document-picker/react-native-document-picker.debug.xcconfig # ios/Pods/Target Support Files/react-native-document-picker/react-native-document-picker.release.xcconfig # ios/Pods/Target Support Files/react-native-jitsi-meet/react-native-jitsi-meet.debug.xcconfig # ios/Pods/Target Support Files/react-native-jitsi-meet/react-native-jitsi-meet.release.xcconfig # ios/Pods/Target Support Files/react-native-mmkv-storage/react-native-mmkv-storage.debug.xcconfig # ios/Pods/Target Support Files/react-native-mmkv-storage/react-native-mmkv-storage.release.xcconfig # ios/Pods/Target Support Files/react-native-netinfo/react-native-netinfo.debug.xcconfig # ios/Pods/Target Support Files/react-native-netinfo/react-native-netinfo.release.xcconfig # ios/Pods/Target Support Files/react-native-notifications/react-native-notifications.debug.xcconfig # ios/Pods/Target Support Files/react-native-notifications/react-native-notifications.release.xcconfig # ios/Pods/Target Support Files/react-native-orientation-locker/react-native-orientation-locker.debug.xcconfig # ios/Pods/Target Support Files/react-native-orientation-locker/react-native-orientation-locker.release.xcconfig # ios/Pods/Target Support Files/react-native-restart/react-native-restart.debug.xcconfig # ios/Pods/Target Support Files/react-native-restart/react-native-restart.release.xcconfig # ios/Pods/Target Support Files/react-native-safe-area-context/react-native-safe-area-context.debug.xcconfig # ios/Pods/Target Support Files/react-native-safe-area-context/react-native-safe-area-context.release.xcconfig # ios/Pods/Target Support Files/react-native-simple-crypto/react-native-simple-crypto.debug.xcconfig # ios/Pods/Target Support Files/react-native-simple-crypto/react-native-simple-crypto.release.xcconfig # ios/Pods/Target Support Files/react-native-slider/react-native-slider.debug.xcconfig # ios/Pods/Target Support Files/react-native-slider/react-native-slider.release.xcconfig # ios/Pods/Target Support Files/react-native-webview/react-native-webview.debug.xcconfig # ios/Pods/Target Support Files/react-native-webview/react-native-webview.release.xcconfig # ios/Pods/Target Support Files/rn-extensions-share/rn-extensions-share.debug.xcconfig # ios/Pods/Target Support Files/rn-extensions-share/rn-extensions-share.release.xcconfig # ios/Pods/Target Support Files/rn-fetch-blob/rn-fetch-blob.debug.xcconfig # ios/Pods/Target Support Files/rn-fetch-blob/rn-fetch-blob.release.xcconfig # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # ios/Shared/Models/MessageType.swift # package.json # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Issue(s)
How to test or reproduce
Screenshots
Types of changes
Checklist
Further comments