[NEW] Passcode and biometric unlock#2059
Merged
diegolmello merged 98 commits intodevelopfrom May 8, 2020
Merged
Conversation
|
This pull request introduces 2 alerts when merging 5340977 into e46ee13 - view on LGTM.com new alerts:
|
djorkaeffalexandre
suggested changes
May 4, 2020
|
This pull request introduces 2 alerts when merging 431ca78 into c578f1b - view on LGTM.com new alerts:
|
|
This pull request introduces 1 alert when merging ec328fc into c578f1b - view on LGTM.com new alerts:
|
# Conflicts: # __mocks__/react-native-device-info.js # __tests__/__snapshots__/Storyshots.test.js.snap # android/app/src/main/java/chat/rocket/reactnative/generated/BasePackageList.java # ios/Podfile.lock # ios/Pods/Local Podspecs/EXWebBrowser.podspec.json # ios/Pods/Local Podspecs/RNDeviceInfo.podspec.json # ios/Pods/Local Podspecs/ReactNativeKeyboardTrackingView.podspec.json # ios/Pods/Local Podspecs/UMAppLoader.podspec.json # ios/Pods/Local Podspecs/UMCore.podspec.json # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/EXImageLoader/EXImageLoader.xcconfig # ios/Pods/Target Support Files/EXKeepAwake/EXKeepAwake-prefix.pch # ios/Pods/Target Support Files/EXLocalAuthentication/EXLocalAuthentication-prefix.pch # 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.debug.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist # 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/SocketRocket/SocketRocket-prefix.pch # ios/Pods/Target Support Files/UMAppLoader/UMAppLoader.xcconfig # ios/Pods/Target Support Files/UMReactNativeAdapter/UMReactNativeAdapter.xcconfig # package.json # yarn.lock
|
This pull request introduces 1 alert when merging 2ddbc6e into ce51982 - view on LGTM.com new alerts:
|
@RocketChat/ReactNative