Diego Mello 5e633e550e Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/play/google-services.json # app/lib/database/index.js # app/sagas/init.js # app/sagas/login.js # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/MMKV/MMKV-prefix.pch # ios/Pods/Target Support Files/MMKV/MMKV.debug.xcconfig # ios/Pods/Target Support Files/MMKV/MMKV.release.xcconfig # ios/Pods/Target Support Files/MMKVCore/MMKVCore.debug.xcconfig # ios/Pods/Target Support Files/MMKVCore/MMKVCore.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.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/RNConfigReader/RNConfigReader.debug.xcconfig # ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.release.xcconfig # ios/Pods/Target Support Files/react-native-cookies/react-native-cookies.debug.xcconfig # ios/Pods/Target Support Files/react-native-simple-crypto/react-native-simple-crypto.debug.xcconfig # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-10-05 17:19:36 -03:00
..
createChannel.js	[NEW] E2E Encryption (#2394)	2020-09-11 11:31:38 -03:00
createDiscussion.js	[NEW] Log events from RoomsList, SideDrawer and Profile (#2190)	2020-07-30 10:26:17 -03:00
deepLinking.js	[NEW] Encrypt user credentials and preferences (#2247)	2020-08-19 14:14:22 -03:00
encryption.js	[NEW] E2E Encryption push (iOS) (#2463)	2020-09-24 15:34:13 -03:00
index.js	[NEW] E2E Encryption (#2394)	2020-09-11 11:31:38 -03:00
init.js	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
inviteLinks.js	[NEW] Invite links (#1534)	2020-01-28 10:22:35 -03:00
login.js	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
messages.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00
room.js	[NEW] Log remaining events (#2368)	2020-08-05 10:15:56 -03:00
rooms.js	[CHORE] Change database location to Experimental Apps (#2483)	2020-09-23 14:16:04 -03:00
selectServer.js	[CHORE] Change database location to Experimental Apps (#2483)	2020-09-23 14:16:04 -03:00
state.js	[CHORE] Update react-navigation to v5 (#2154)	2020-06-15 11:00:46 -03:00