Merged
Conversation
…ct to be updated outside an action (#1342)
* 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
|
|
|
This pull request introduces 2 alerts when merging 6f3fa10 into 230c336 - view on LGTM.com new alerts:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@RocketChat/ReactNative