Merge beta into master #2032

diegolmello · 2020-04-13T19:08:39Z

@RocketChat/ReactNative

…ct to be updated outside an action (#1342)

…ed (#1344)

* fixed-modal-position * made-changes Co-authored-by: Djorkaeff Alexandre <[email protected]>

* [FIX] Border style * [FIX] Refactoring * [FIX] fix color of border * Undo Co-authored-by: Aroo <[email protected]> Co-authored-by: Diego Mello <[email protected]>

* [FIX] Deeplinking without rid * [FIX] Join channel * [FIX] Deep linking without rid * Update app/lib/methods/canOpenRoom.js Co-authored-by: Diego Mello <[email protected]>

* First api call working * [NEW] REST API Post wrapper 2FA * [NEW] Send 2FA on Email * [I18n] Add translations * [NEW] Translations & Cancel totp * [CHORE] Totp -> TwoFactor * [NEW] Two Factor by email * [NEW] Tablet Support * [FIX] Text colors * [NEW] Password 2fa * [FIX] Encrypt password on 2FA * [NEW] MethodCall2FA * [FIX] Password fallback * [FIX] Wrap all post/methodCall with 2fa * [FIX] Wrap missed function * few fixes * [FIX] Use new TOTP on Login * [improvement] 2fa methodCall Co-authored-by: Djorkaeff Alexandre <[email protected]>

* [FIX] Correct message for manual approval from admin shown on Registeration * lint fix - added semicolon * Updated the translations * [FIX] Translations * i18n to match server Co-authored-by: Djorkaeff Alexandre <[email protected]> Co-authored-by: Diego Mello <[email protected]>

* [WIP] Reopen without timeOut & ping with 5 sec & Fix Unsubscribe * [FIX] Remove duplicated close * [FIX] Use no-dist lib * [FIX] Try minor fix * [FIX] Try reopen connection when app was put on foreground * [FIX] Remove timeout * [FIX] Build * [FIX] Patch * [FIX] Snapshot * [IMPROVEMENT] Decrease time to reopen * [FIX] Some fixes * [FIX] Update sdk version * [FIX] Subscribe Room Once * [CHORE] Update sdk * [FIX] Subscribe Room * [FIX] Try to resend missed subs * [FIX] Users never show status when start app without network * [FIX] Subscribe to room * [FIX] Multiple servers * [CHORE] Update SDK * [FIX] Don't duplicate streams on subscribeAll * [FIX] Server version when start the app offline * [FIX] Server version cached * [CHORE] Remove unnecessary code * [FIX] Offline server version * [FIX] Subscribe before connect * [FIX] Remove unncessary props * [FIX] Update sdk * [FIX] User status & Unsubscribe Typing * [FIX] Typing at incorrect room * [FIX] Multiple Servers * [CHORE] Update SDK * [REVERT] Undo some changes on SDK * [CHORE] Update sdk to prevent incorrect subscribes * [FIX] Prevent no reconnect * [FIX] Remove close on open * [FIX] Clear typing when disconnect/connect to SDK * [CHORE] Update SDK * [CHORE] Update SDK * Update SDK * fix merge develop Co-authored-by: Diego Mello <[email protected]>

* [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello <[email protected]>

* [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello <[email protected]>

* [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello <[email protected]>

* [FIX] Change notifications preferences * [IMPROVEMENT] Picker View * [I18N] Translations * [FIX] Picker Selection * [FIX] List border * [FIX] Prevent crash * [FIX] Not-Pref tablet * [FIX] Use same style of LanguageView * [IMPROVEMENT] Send listItem title Co-authored-by: Diego Mello <[email protected]>

* [FIX] Split get settings into two requests * [FIX] Clear settings only when change server * [IMPROVEMENT] Move the way to clear settings * [REVERT] Revert some changes * [FIX] Server Icon Co-authored-by: Diego Mello <[email protected]>

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

* [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello <[email protected]>

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

* [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello <[email protected]>

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

* [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello <[email protected]>

# Conflicts: # android/app/build.gradle # app/containers/TwoFactor/index.js # app/containers/TwoFactor/styles.js # app/containers/message/Blocks.js # app/lib/database/index.js # app/lib/methods/canOpenRoom.js # app/lib/methods/getSettings.js # app/lib/methods/subscriptions/rooms.js # app/lib/rocketchat.js # app/sagas/deepLinking.js # app/sagas/selectServer.js # app/utils/room.js # app/views/AuthenticationWebView.js # app/views/ModalBlockView.js # app/views/RoomActionsView/index.js # app/views/RoomView/index.js # app/views/RoomsListView/index.js # app/views/ShareView/index.js # ios/Pods/Local Podspecs/yoga.podspec.json # ios/Pods/Target Support Files/yoga/yoga-dummy.m # ios/Pods/Target Support Files/yoga/yoga.xcconfig # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # yarn.lock

CLAassistant · 2020-04-13T19:08:52Z

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 11 committers have signed the CLA.

✅ regalstreak
✅ Prateek93a
✅ EzequielDeOliveira
✅ devyaniChoubey
✅ phriedrich
✅ diegolmello
✅ GOVINDDIXIT
✅ djorkaeffalexandre
✅ sarthakpranesh
❌ dependabot[bot]
❌ azhaubassar
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

lgtm-com · 2020-04-13T19:14:42Z

This pull request introduces 2 alerts when merging 6f3fa10 into 230c336 - view on LGTM.com

new alerts:

2 for Unsupported state update in lifecycle method

djorkaeffalexandre

LGTM

diegolmello and others added 30 commits October 30, 2019 12:44

[FIX] Remove setState from notifications view causing watermelon obje…

d036996

…ct to be updated outside an action (#1342)

[IMPROVEMENT] Save last message as message when subscription is updat…

2b82ec4

…ed (#1344)

[UPDATE DEPS] Update RN to 0.61.3 (#1345)

9335634

[DOCS] Update Readme (#1346)

176b51b

[CHORE] Remove react-native-scrollable-tab-view fork (#1352)

44415c8

[FIX] URL preview (#1360)

ffeac38

[REGRESSION] Decrease list view memory size (#1361)

ae949e6

[FIX] Paste (#1350)

682ac6b

[CHORE] Update gems (#1365)

371a93d

Bump version to 1.20.3 (#1366)

ea057ff

[FIX] Use Ruby 2.4 on TestFlight upload (#1368)

e0f0f99

[FIX] Parse Urls (#1371)

3852350

[FIX] Parse image URL only if it's not empty (#1372)

5e4ce8f

[FIX] Load messages issues (#1373)

0b68e98

Bump version to 1.21.0 (#1376)

40ae78c

[FIX] Crowd login (#1381)

11e1778

[FIX] Clicking user avatar in thread previews crashes app (#1363)

edf7312

[IMPROVEMENT] Error messages on connect (#1379)

1b28331

[FIX] ProfileView input navigation error when custom fields aren't set (

447b483

#1383)

[FIX] Batch server deletion on logout (#1382)

6f95bb0

Bump app to 1.22.0 (#1387)

b7ebd3b

[FIX] Server Version (#1392)

5ff07a6

Update patch and minor deps (#1386)

cfd63a6

[FIX] Crash when open thread (#1395)

2aaa27d

Bump version to 1.23.0 (#1394)

40c3978

[I18N] Update ru.js (#1384)

3f614bc

[FIX] CAS building wrong URL (#1362)

e172919

[FIX] Delete messages (#1399)

29302cc

[FIX] In-app notification showing wrong content on channels (#1400)

89209a9

Bump version to 1.24.0 (#1404)

265c3e7

Prateek93a and others added 25 commits April 1, 2020 13:10

[FIX] MultiSelect Keyboard behavior (Android) (#1969)

011ac04

* fixed-modal-position * made-changes Co-authored-by: Djorkaeff Alexandre <[email protected]>

[FIX] Bottom border style on DirectoryView (#1963)

3d80f95

* [FIX] Border style * [FIX] Refactoring * [FIX] fix color of border * Undo Co-authored-by: Aroo <[email protected]> Co-authored-by: Diego Mello <[email protected]>

[FIX] Clear settings on server change (#1967)

9f830c7

[FIX] Deeplinking without RoomId (#1925)

18afdd8

* [FIX] Deeplinking without rid * [FIX] Join channel * [FIX] Deep linking without rid * Update app/lib/methods/canOpenRoom.js Co-authored-by: Diego Mello <[email protected]>

[FIX] Direct Message between multiple users REST (#1974)

d810c28

[FIX] Single message thread inserting thread without rid (#1999)

afb68c7

[FIX] ThreadMessagesView crashing on load (#1997)

0298c38

[FIX] Saml (#1996)

32d1050

* [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello <[email protected]>

[FIX] Change user own status (#1995)

c24c16c

* [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello <[email protected]>

[FIX] Loading all updated rooms after app resume (#1998)

78441bf

* [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello <[email protected]>

Bump version to 4.6.1 (#2001)

4666057

[FIX] DM header blink (#2011)

2e65a79

[REGRESSION] Invite Links (#2007)

1427e53

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

[FIX] Read only channel/broadcast (#1951)

404c381

* [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello <[email protected]>

[FIX] Cas auth (#2024)

acf7079

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

[FIX] Login TOTP Compatibility to older servers (#2018)

2b3ccf4

* [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello <[email protected]>

Bump version to 4.6.4 (#2029)

a7641c1

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

[FIX] Lint (#2030)

8445baf

[FIX] UIKit with only one block (#2022)

91ff6e4

* [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello <[email protected]>

djorkaeffalexandre approved these changes Apr 13, 2020

View reviewed changes

diegolmello merged commit 933362e into master Apr 13, 2020

diegolmello deleted the beta branch April 13, 2020 19:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge beta into master #2032

Merge beta into master #2032

diegolmello commented Apr 13, 2020

CLAassistant commented Apr 13, 2020

lgtm-com bot commented Apr 13, 2020

djorkaeffalexandre left a comment

Merge beta into master #2032

Merge beta into master #2032

Conversation

diegolmello commented Apr 13, 2020

CLAassistant commented Apr 13, 2020

lgtm-com bot commented Apr 13, 2020

djorkaeffalexandre left a comment

Choose a reason for hiding this comment