Skip to content

Merge beta into master#2003

Merged
diegolmello merged 391 commits intomasterfrom
beta
Apr 7, 2020
Merged

Merge beta into master#2003
diegolmello merged 391 commits intomasterfrom
beta

Conversation

@diegolmello
Copy link
Copy Markdown
Member

@RocketChat/ReactNative

CalebeRios and others added 30 commits October 28, 2019 17:51
GOVINDDIXIT and others added 24 commits March 30, 2020 11:20
* fix: change default directory listing to Users

* follow server settings

* Fix state to props

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

* OnboardingView

* FormContainer

* Minor fixes

* NewServerView

* Remove code

* Refactor

* WorkspaceView

* Stash

* Login with email working

* Login with

* Join open

* Revert "Login with"

This reverts commit d05dc50.

* Fix create account styles

* Register

* Refactor

* LoginServices component

* Refactor

* Multiple servers

* Remove native images

* Refactor styles

* Fix testid

* Fix add server on tablet

* i18n

* Fix close modal

* Fix TOTP

* [FIX] Registration disabled

* [FIX] Login Services separator

* Fix logos

* Fix AppVersion name

* I18n

* Minor fixes

* [FIX] Custom Fields

Co-authored-by: Djorkaeff Alexandre <[email protected]>
* [WIP][NEW] Create Discussion

* [FIX] Clear multiselect & Translations

* [NEW] Create Discussion at MessageActions

* [NEW] Disabled Multiselect

* [FIX] Initial channel

* [NEW] Create discussion on MessageBox Actions

* [FIX] Crashing on edit name

* [IMPROVEMENT] New message layout

* [CHORE] Update README

* [NEW] Avatars on MultiSelect

* [FIX] Select Users

* [FIX] Add redirect and Handle tablet

* [IMPROVEMENT] Split CreateDiscussionView

* [FIX] Create a discussion inner discussion

* [FIX] Create a discussion

* [I18N] Add pt-br

* Change icons

* [FIX] Nav to discussion & header title

* Fix header

Co-authored-by: Diego Mello <[email protected]>
* Create updateLastOpen param on readMessages

* Remove InteractionManager from load messages
* [NEW] Custom Status

* [FIX] Subscribe to changes

* [FIX] Improve code using Banner component

* [IMPROVEMENT] Toggle modal

* [NEW] Edit custom status from Sidebar

* [FIX] Modal when tablet

* [FIX] Styles

* [FIX] Switch to react-native-promp-android

* [FIX] Custom Status UI

* [TESTS] E2E Custom Status

* Fix banner

* Fix banner

* Fix subtitle

* status text

* Fix topic header

* Fix RoomActionsView topic

* Fix header alignment on Android

* [FIX] RoomInfo crashes when without statusText

* [FIX] Use users.setStatus

* [FIX] Remove customStatus of ProfileView

* [FIX] Room View Thread Header

Co-authored-by: Diego Mello <[email protected]>
* [WIP] DM between multiple users

* [WIP][NEW] Create new DM between multiple users

* [IMPROVEMENT] Improve createChannel Sagas

* [IMPROVEMENT] Selected Users view

* [IMPROVEMENT] Room Actions of Group DM

* [NEW] Create new DM between multiple users

* [NEW] Group DM avatar

* [FIX] Directory border

* [IMPROVEMENT] Use isGroupChat

* [CHORE] Remove legacy getRoomMemberId

* [NEW] RoomTypeIcon

* [FIX] No use legacy method on RoomInfoView

* [FIX] Blink header when create new DM

* [FIX] Only show create direct message option when allowed

* [FIX] RoomInfoView

* pt-BR

* Few fixes

* Create button name

* Show create button only after a user is selected

* Fix max users issues

Co-authored-by: Diego Mello <[email protected]>
* Navigate to new server workspace from ServerDropdown if there's no token

* Hide login button based on login services and Accounts_ShowFormLogin setting

* [FIX] Lint

Co-authored-by: Djorkaeff Alexandre <[email protected]>
* 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]>
# Conflicts:
#	.circleci/config.yml
#	README.md
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
#	android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
#	android/app/src/main/res/values/strings.xml
#	app/actions/actionsTypes.js
#	app/actions/index.js
#	app/actions/room.js
#	app/constants/settings.js
#	app/constants/tablet.js
#	app/containers/Avatar.js
#	app/containers/Button/index.js
#	app/containers/Check.js
#	app/containers/ListItem.js
#	app/containers/MessageActions.js
#	app/containers/MessageBox/LeftButtons.ios.js
#	app/containers/MessageBox/RightButtons.android.js
#	app/containers/MessageBox/UploadModal.js
#	app/containers/MessageBox/buttons/FileButton.js
#	app/containers/MessageBox/index.js
#	app/containers/RoomTypeIcon.js
#	app/containers/Status/Status.js
#	app/containers/Status/index.js
#	app/containers/TextInput.js
#	app/containers/UIKit/MultiSelect/Chips.js
#	app/containers/UIKit/MultiSelect/Input.js
#	app/containers/UIKit/MultiSelect/Items.js
#	app/containers/UIKit/MultiSelect/index.js
#	app/containers/UIKit/MultiSelect/styles.js
#	app/containers/markdown/index.js
#	app/containers/message/User.js
#	app/i18n/locales/de.js
#	app/i18n/locales/en.js
#	app/i18n/locales/es-ES.js
#	app/i18n/locales/it.js
#	app/i18n/locales/ja.js
#	app/i18n/locales/nl.js
#	app/i18n/locales/pt-BR.js
#	app/i18n/locales/ru.js
#	app/index.js
#	app/lib/database/index.js
#	app/lib/database/model/Subscription.js
#	app/lib/database/model/User.js
#	app/lib/database/model/migrations.js
#	app/lib/database/schema/app.js
#	app/lib/database/schema/servers.js
#	app/lib/methods/canOpenRoom.js
#	app/lib/methods/getSettings.js
#	app/lib/methods/getUsersPresence.js
#	app/lib/methods/helpers/mergeSubscriptionsRooms.js
#	app/lib/methods/loadMessagesForRoom.js
#	app/lib/methods/loadMissedMessages.js
#	app/lib/methods/readMessages.js
#	app/lib/methods/subscriptions/room.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/rocketchat.js
#	app/presentation/RoomItem/TypeIcon.js
#	app/presentation/RoomItem/index.js
#	app/presentation/UserItem.js
#	app/reducers/index.js
#	app/reducers/reducers.js
#	app/reducers/room.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/index.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/sagas/rooms.js
#	app/sagas/selectServer.js
#	app/selectors/login.js
#	app/tablet.js
#	app/utils/fetch.js
#	app/utils/shortnameToUnicode/emojis.js
#	app/views/AuthenticationWebView.js
#	app/views/CreateChannelView.js
#	app/views/DirectoryView/index.js
#	app/views/ForgotPasswordView.js
#	app/views/LoginSignupView.js
#	app/views/LoginView.js
#	app/views/NewMessageView.js
#	app/views/NewServerView.js
#	app/views/NotificationPreferencesView/index.js
#	app/views/NotificationPreferencesView/styles.js
#	app/views/OnboardingView/Button.js
#	app/views/OnboardingView/index.js
#	app/views/OnboardingView/styles.js
#	app/views/ProfileView/index.js
#	app/views/RegisterView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomView/Header/Header.js
#	app/views/RoomView/Header/Icon.js
#	app/views/RoomView/Header/index.js
#	app/views/RoomView/index.js
#	app/views/RoomView/styles.js
#	app/views/RoomsListView/ServerDropdown.js
#	app/views/RoomsListView/index.js
#	app/views/SelectedUsersView.js
#	app/views/ShareListView/Header/Header.ios.js
#	app/views/ShareListView/index.js
#	app/views/SidebarView/SidebarItem.js
#	app/views/SidebarView/index.js
#	app/views/SidebarView/styles.js
#	app/views/Styles.js
#	app/views/ThreadMessagesView/index.js
#	app/views/WithoutServersView.js
#	ios/Podfile.lock
#	ios/Pods/Local Podspecs/RNBootSplash.podspec.json
#	ios/Pods/Local Podspecs/yoga.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Target Support Files/yoga/yoga-dummy.m
#	ios/Pods/Target Support Files/yoga/yoga.xcconfig
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/AppDelegate.m
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	storybook/stories/index.js
#	yarn.lock
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
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.
10 out of 12 committers have signed the CLA.

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

@lgtm-com
Copy link
Copy Markdown

lgtm-com bot commented Apr 7, 2020

This pull request fixes 1 alert when merging d05df60 into 96bfe19 - view on LGTM.com

fixed alerts:

  • 1 for Useless conditional

@diegolmello diegolmello merged commit 230c336 into master Apr 7, 2020
@diegolmello diegolmello deleted the beta branch April 7, 2020 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.