Merge beta into master #2309

diegolmello · 2020-07-17T13:24:40Z

@RocketChat/ReactNative

* [FIX] Different sourcemaps generation for Hermes * Upload sourcemaps after build

Co-authored-by: Diego Mello <[email protected]>

#2255) 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]>

…on tablet (#2259)

* [FIX] Action sheet cutting emojis on the header * fix tablet case Co-authored-by: Djorkaeff Alexandre <[email protected]>

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-JPEGJS-570039 - https://snyk.io/vuln/SNYK-JS-LODASH-567746 Co-authored-by: Diego Mello <[email protected]>

* cleaned mixed usage of "du" and "Sie" Co-authored-by: Diego Mello <[email protected]>

* Upgrade nvm * Upgrade XCode * Use nvm's default installed version of node (LTS) Co-authored-by: Diego Mello <[email protected]>

* Add expo-apple-authentication * Button * Create new provisioning profiles * Login with Apple * Change provisioning profile * Button color based on theme Co-authored-by: Djorkaeff Alexandre <[email protected]>

…#2283) * Wrap video preview with ScrollView so Messagebox is shown properly * Fix border color

* Add docker env with orchestration * Update detox, update mocha config format * One simulator at a time - mocha won't run parallel * Docker runner, with test changes to match RC data * Better error trapping in infrastructure control script * Swap user provisioning from Mongo to RC API to work against existing servers * Add docker to e2e readme * Stop using example.com for emails * Default detox to the tests directory * Add working configs for both run scenarios * Add some optional forcing of data.js version for Docker

Co-authored-by: Diego Mello <[email protected]>

CLAassistant · 2020-07-17T13:24:50Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
9 out of 10 committers have signed the CLA.

✅ Fishbowler
✅ diegolmello
✅ djorkaeffalexandre
✅ GOVINDDIXIT
✅ EzequielDeOliveira
✅ regalstreak
✅ phriedrich
✅ hengsok
✅ youssef-md
❌ snyk-bot
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

# Conflicts: # .circleci/config.yml # android/app/build.gradle # app/constants/colors.js # app/containers/ActionSheet/styles.js # app/containers/DisclosureIndicator.js # app/containers/Header/index.js # app/containers/HeaderButton.js # app/containers/LoginServices.js # app/containers/MessageActions/Header.js # app/containers/MessageActions/index.js # app/containers/MessageBox/EmojiKeyboard.js # app/containers/MessageBox/Recording.js # app/containers/MessageBox/RightButtons.android.js # app/containers/MessageBox/RightButtons.ios.js # app/containers/MessageBox/buttons/AudioButton.js # app/containers/MessageBox/buttons/index.js # app/containers/MessageBox/index.js # app/containers/MessageBox/styles.js # app/containers/SearchBox.js # app/containers/StatusBar.js # app/containers/message/Audio.js # app/i18n/locales/de.js # app/i18n/locales/en.js # app/i18n/locales/es-ES.js # app/i18n/locales/ja.js # app/i18n/locales/nl.js # app/i18n/locales/pt-BR.js # app/i18n/locales/ru.js # app/lib/database/index.js # app/lib/methods/getSettings.js # app/lib/rocketchat.js # app/presentation/ImageViewer/ImageViewer.android.js # app/utils/navigation/animations.js # app/utils/navigation/index.js # app/views/AttachmentView.js # app/views/NotificationPreferencesView/index.js # app/views/RegisterView.js # app/views/RoomView/Header/Header.js # app/views/RoomView/Header/Icon.js # app/views/RoomView/Header/RightButtons.js # app/views/RoomView/Header/index.js # app/views/RoomView/index.js # app/views/RoomsListView/Header/Header.android.js # app/views/RoomsListView/Header/Header.ios.js # app/views/RoomsListView/Header/index.js # app/views/RoomsListView/ListHeader/SearchBar.js # app/views/RoomsListView/ListHeader/index.js # app/views/RoomsListView/index.js # app/views/RoomsListView/styles.js # app/views/ShareView/Preview.js # app/views/ShareView/index.js # app/views/SidebarView/index.js # app/views/ThreadMessagesView/index.js # e2e/README.md # e2e/helpers/app.js # e2e/tests/assorted/01-changeserver.spec.js # e2e/tests/assorted/02-broadcast.spec.js # e2e/tests/assorted/03-profile.spec.js # e2e/tests/assorted/04-setting.spec.js # e2e/tests/assorted/05-joinpublicroom.spec.js # e2e/tests/onboarding/01-onboarding.spec.js # e2e/tests/onboarding/03-forgotpassword.spec.js # e2e/tests/onboarding/04-createuser.spec.js # e2e/tests/onboarding/05-login.spec.js # e2e/tests/onboarding/06-roomslist.spec.js # e2e/tests/room/01-createroom.spec.js # e2e/tests/room/02-room.spec.js # e2e/tests/room/03-roomactions.spec.js # e2e/tests/room/04-roominfo.spec.js # ios/Podfile.lock # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/EXAppleAuthentication/EXAppleAuthentication-prefix.pch # ios/Pods/Target Support Files/EXHaptics/EXHaptics-prefix.pch # ios/Pods/Target Support Files/EXImageLoader/EXImageLoader-prefix.pch # ios/Pods/Target Support Files/EXKeepAwake/EXKeepAwake-prefix.pch # ios/Pods/Target Support Files/EXLocalAuthentication/EXLocalAuthentication-prefix.pch # ios/Pods/Target Support Files/EXVideoThumbnails/EXVideoThumbnails-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/Protobuf/Protobuf-prefix.pch # ios/Pods/Target Support Files/QBImagePickerController/QBImagePickerController-prefix.pch # ios/Pods/Target Support Files/RSKImageCropper/RSKImageCropper-prefix.pch # ios/Pods/Target Support Files/React/React-prefix.pch # ios/Pods/Target Support Files/react-native-splash-screen/react-native-splash-screen-prefix.pch # ios/Pods/Target Support Files/yoga/yoga-dummy.m # ios/Pods/Target Support Files/yoga/yoga-prefix.pch # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Base.lproj/MainInterface.storyboard # ios/ShareRocketChatRN/Info.plist # package.json # yarn.lock

djorkaeffalexandre

LGTM

Daanchaam and others added 30 commits February 7, 2020 10:04

[i18n] Added Dutch translation (#1676)

ba37bb1

[NEW] Omnichannel Beta (#1674)

b90cf9e

[NEW] Confirm logout/clear cache (#1688)

28b5821

[I18N] Add es-ES language (#1495)

dc0cabf

[NEW] UiKit Beta (#1497)

b87472f

[IMPROVEMENT] Use reselect (#1696)

3683b89

[FIX] Notification in Android API level less than 24 (#1692)

e588c1f

[IMPROVEMENT] Send tmid on slash commands and media (#1698)

8366835

[FIX] Unhandled action on UIKit (#1703)

ebe36cd

[NEW] Pull to refresh RoomsList (#1701)

42a53b4

[IMPROVEMENT] Reset app when language is changed (#1702)

1d79746

[FIX] Small fixes on UIKit (#1709)

3a87872

[FIX] Spotlight (#1719)

58e5781

[CHORE] Update react-native-image-crop-picker (#1712)

952dc76

[FIX] Messages Overlapping (Android) and MessageBox Scroll (iOS) (#1720)

88c0ba6

[REGRESSION] Remove @ and # from mention (#1721)

400d332

[NEW] Direct message from user info (#1516)

f1bf2bb

[FIX] Delete slash commands (#1723)

4a63cb0

[IMPROVEMENT] Hold URL to copy (#1684)

91518a1

[FIX] Different sourcemaps generation for Hermes (#1724)

a62dfef

* [FIX] Different sourcemaps generation for Hermes * Upload sourcemaps after build

[REVERT] Show emoji keyboard on Android (#1738)

d970952

[FIX] Stop logging react-native-image-crop-picker (#1745)

290c53e

[FIX] Prevent toast ref error (#1744)

677b288

[FIX] Prevent reaction map error (#1743)

a200e97

[FIX] Add missing calls to user info (#1741)

a580d3a

[FIX] Catch room unsubscribe error (#1739)

a341f0d

[i18n] Missing German keys (#1735)

6a45d1d

[FIX] Missing i18n on MessagesView title (#1733)

85dfe1b

[FIX] UIKit Modal: Weird behavior on Android Tablet (#1742)

777cb28

[i18n] Missing key on German (#1747)

053185e

Co-authored-by: Diego Mello <[email protected]>

djorkaeffalexandre and others added 23 commits July 8, 2020 13:40

[FIX] AttachmentView crashing during title decode (#2253)

5b3be4e

Co-authored-by: Diego Mello <[email protected]>

[FIX] Command previews crashing when API returns an error (#2254)

e1153de

Co-authored-by: Diego Mello <[email protected]>

[FIX] ThreadMessagesView throwing error when subscription wasn't found (

ef68f16

#2255) Co-authored-by: Diego Mello <[email protected]>

[FIX] Register crashing when error data is undefined (#2256)

ea10693

Co-authored-by: Diego Mello <[email protected]>

[FIX] Get active route returning undefined (#2257)

53cc823

Co-authored-by: Diego Mello <[email protected]>

[FIX] ImageViewer not recognising gestures after zoomed (#2261)

0923851

* [FIX] Zoomed in images must react to gestures * AnimatedFastImage -> AnimatedImage Co-authored-by: Diego Mello <[email protected]>

[FIX] Android stack animation throwing illegal node ID (#2260)

b8f87f7

[FIX] Navigation object undefined when tapping sidebar's user header …

afb0707

…on tablet (#2259)

[FIX] Action sheet cutting emojis on the header (#2263)

fc84324

* [FIX] Action sheet cutting emojis on the header * fix tablet case Co-authored-by: Djorkaeff Alexandre <[email protected]>

[FIX] Mime type check crashing the app (#2264)

f70d828

[FIX] Notification preferences update crashing the app (#2262)

5782a33

[FIX] Create discussion not working from MessageActions (#2265)

aef7125

[FIX] getSettings not catching errors (#2271)

f3b02a6

[REGRESSION] Jitsi Call doesn't send message link (#2277)

146babc

[FIX] Messages hidden behind MessageBox (#2281)

d3ab125

fix: package.json & yarn.lock to reduce vulnerabilities (#2275)

ab9b0b0

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-JPEGJS-570039 - https://snyk.io/vuln/SNYK-JS-LODASH-567746 Co-authored-by: Diego Mello <[email protected]>

[i18n] Add missing german strings (#2278)

7275314

* cleaned mixed usage of "du" and "Sie" Co-authored-by: Diego Mello <[email protected]>

[CHORE] CircleCI Upgrades (#2269)

6436199

* Upgrade nvm * Upgrade XCode * Use nvm's default installed version of node (LTS) Co-authored-by: Diego Mello <[email protected]>

[NEW] Sign in with Apple (#2282)

8a24eb0

* Add expo-apple-authentication * Button * Create new provisioning profiles * Login with Apple * Change provisioning profile * Button color based on theme Co-authored-by: Djorkaeff Alexandre <[email protected]>

[FIX] MessageBox not being shown on ShareView when Preview is a video (…

bbe15b7

…#2283) * Wrap video preview with ScrollView so Messagebox is shown properly * Fix border color

[CHORE] Consistent Rocket.Chat Branding (#2293)

97cd223

Co-authored-by: Diego Mello <[email protected]>

Bump version to 4.10.0 (#2305)

fa6897f

diegolmello added the 💎 release label Jul 17, 2020

diegolmello force-pushed the beta branch from c14fdf3 to 594b8ee Compare July 17, 2020 13:59

djorkaeffalexandre approved these changes Jul 17, 2020

View reviewed changes

diegolmello merged commit 0c7a9b9 into master Jul 17, 2020

diegolmello deleted the beta branch July 17, 2020 14:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge beta into master #2309

Merge beta into master #2309

diegolmello commented Jul 17, 2020

CLAassistant commented Jul 17, 2020 •

edited

Loading

djorkaeffalexandre left a comment

Merge beta into master #2309

Merge beta into master #2309

Conversation

diegolmello commented Jul 17, 2020

CLAassistant commented Jul 17, 2020 • edited Loading

djorkaeffalexandre left a comment

Choose a reason for hiding this comment

CLAassistant commented Jul 17, 2020 •

edited

Loading