Skip to content

Update dependencies#2301

Merged
diegolmello merged 20 commits intodevelopfrom
update-deps
Jul 20, 2020
Merged

Update dependencies#2301
diegolmello merged 20 commits intodevelopfrom
update-deps

Conversation

@diegolmello
Copy link
Copy Markdown
Member

@diegolmello diegolmello commented Jul 16, 2020

@RocketChat/ReactNative

diegolmello added 14 commits July 7, 2020 13:19
@diegolmello
Update RN to 0.63.0-rc.1
21a1a20
@diegolmello
Updating
81b6ab0
@diegolmello
Fix keyboard
8e371ae
@diegolmello
Merge branch 'develop' into update-rn-63
cb7e1be 
# Conflicts:
#	ios/Podfile.lock
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	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
#	yarn.lock
@diegolmello
Fix native stuff on Messagebox
751ded4
@diegolmello
Update to RN 0.63.1
d449bbe
@diegolmello
Update pods
4443a01
@diegolmello
Update patches
36a09ec
@diegolmello
Update minors
89b5555
@diegolmello
Majors
39ca082
@diegolmello
Remove base-64 in favour of js-base64
cabe3b3
@diegolmello
others
7897bd6
@diegolmello
Pods
5e737c2
@diegolmello
Merge branch 'develop' into update-deps
2e69301 
# Conflicts:
#	yarn.lock
@diegolmello
Flipper
7eb8a70
@diegolmello
Yarn
2770032
@diegolmello
Merge branch 'develop' into update-deps
6f5c3ee
@diegolmello
Merge branch 'develop' into update-deps
36c3471 
# Conflicts:
#	ios/Podfile.lock
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/SDWebImage/SDWebImage/Core/SDWebImageDownloaderRequestModifier.h
#	ios/Pods/SDWebImage/SDWebImage/Core/SDWebImageDownloaderRequestModifier.m
#	ios/Pods/SDWebImage/SDWebImage/Core/SDWebImageDownloaderResponseModifier.h
#	ios/Pods/SDWebImage/SDWebImage/Core/SDWebImageError.h
#	ios/Pods/SDWebImage/SDWebImage/Core/SDWebImageManager.m
#	ios/Pods/SDWebImage/SDWebImage/Core/UIView+WebCache.m
#	package.json
#	yarn.lock
@diegolmello diegolmello mentioned this pull request Jul 17, 2020
Closed
@diegolmello diegolmello merged commit 9882ace into develop Jul 20, 2020
@diegolmello diegolmello deleted the update-deps branch July 20, 2020 16:35
diegolmello added a commit that referenced this pull request Sep 1, 2020
@diegolmello @djorkaeffalexandre
@youssef-md @Prateek93a @phriedrich @sarthakpranesh @devyaniChoubey @EzequielDeOliveira @regalstreak @dependabot @GOVINDDIXIT @azhaubassar @zhaubassar @Badal1234 @BrunoOliveiraDantas @CalebeRios @Fishbowler @snyk-bot @refactor-droidyy @grahamsmith @gabriellsh @juliagrala
Merge beta into master (#2445