Skip to content

Merge 4.24.0 into single-server#3649

Merged
diegolmello merged 336 commits into
single-serverfrom
4.24.0-single-server
Jan 24, 2022
Merged

Merge 4.24.0 into single-server#3649
diegolmello merged 336 commits into
single-serverfrom
4.24.0-single-server

Conversation

@diegolmello

Copy link
Copy Markdown
Member

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Further comments

kresnaputra and others added 30 commits April 1, 2021 11:00
Co-authored-by: Diego Mello <diegolmello@gmail.com>
* [FIX] Search input not using the whole space

* Fix on getHeaderTitlePosition

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* [FIX] E2EE password hiding automatically

* add e2e test

* fixed hiding banner

* move e2e tests to 01-e2eencryption

* remove console.log

* Fix tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* [E2E TEST] Move threads test to another file

* changed descirbe title

* Rearrange files

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* [FIX] Fix Regex Typo

* Add story for testing

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* [FIX] Make attachment validation compatible with web client

* Added stories

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Remove time if no message_link

* Fix message stories for replies

* Final stories fix

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Use I18n translate in login text input label

* Add to register and add missing strings

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Database migration

* RoomItem icon

* Team icons

* Teams group

* Small tweak on RoomTypeIcon

* RoomView Header

* Add team's channels to RoomView header

* Starting TeamChannelsView

* Icon size

* o data found

* Update TeamChannelsView, add teams subscriptions and send params to TeamChannelsView

* Use teams.ListRooms endpoint, render rooms list, remove unused functions

* Show team main on TeamChannelsView

* Disable swipe

* Pagination working

* Fix blinking no data found

* Search working

* Refactor to use BackgroundContainer while loading

* Go to room

* Cleanup

* Go to actions

* Events

* Lint

* Add debounce to go room

* Fix for tablet

* i18n

* Small fix

* Minor refactor

* Use local data when it exists

* Show last message

* Force teams migration

* Add stories to BackgroundContainer

* Remove unused component

* Move RoomViewHeader into containers folder

* Refactoring

* Testing RoomHeader

* i18n

* Fix server endpoint version

* Fix events

Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
* [Improvement] Improve mentions

This PR focuses on improving command, emoji, channel and user mentions.

* [Tests] Added e2e tests for mention improvement

* [Improvement] Modify slash command mention logic.
Added slash command with argument preview
Slash command should show only if the message bigins with /

* Return data on search for empty text

* Minor fixes

* Update e2e tests

* Minor fix

* [FIX] allow command mentioning in between text

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Update StatusView.js

* Minor tweak

* Minor tweaks

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Add search by name in members list

* Update RoomMembersView search

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Updated detox and 5 tests

* Update e2e cases for Detox v18, update setUserStatus and added SET_STATUS_FAIL

* Downgrade mocha

* Exclude arm64 from building and update tests cases

* Update more tests cases, add registeringUser4

* Update more test files and add room-actions-scrollview testID

* Update package.json

* Remove unused username from test file and update 08-roominfo test file

* Fixing

* Mark as unread

* Fixing flaky tests

* Minor fixes

Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
* [CHORE] Improve stories

* Refactor Avatar and UIKitModal

* fixed undefined 'name'

* Remove commented stories

* Remove Markdown from stories/index, update Markdown test file and remove markdown stories from Message stories

* Remove StoriesSeparator

* Refactor Markdown

* Remove commented lines of code

* Small refactor

* Re-add stories

Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
reinaldonetof and others added 20 commits January 11, 2022 11:33
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
…3586)

Co-authored-by: GleidsonDaniel <gleidson10daniel@hotmail.com>
Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
# Conflicts:
#	.eslintrc.js
#	android/app/build.gradle
#	app.json
#	app/AppContainer.tsx
#	app/actions/actionsTypes.js
#	app/containers/ActionSheet/Button.ts
#	app/containers/Avatar/Avatar.tsx
#	app/containers/Avatar/index.tsx
#	app/containers/Avatar/interfaces.ts
#	app/containers/BackgroundContainer/index.tsx
#	app/containers/HeaderButton/Common.tsx
#	app/containers/HeaderButton/HeaderButtonItem.tsx
#	app/containers/List/ListContainer.tsx
#	app/containers/List/ListHeader.tsx
#	app/containers/List/ListIcon.tsx
#	app/containers/List/ListInfo.tsx
#	app/containers/List/ListItem.tsx
#	app/containers/List/ListSection.tsx
#	app/containers/List/ListSeparator.tsx
#	app/containers/Loading.tsx
#	app/containers/MessageActions/Header.tsx
#	app/containers/MessageActions/index.tsx
#	app/containers/MessageBox/CommandsPreview/Item.tsx
#	app/containers/MessageBox/CommandsPreview/index.tsx
#	app/containers/MessageBox/index.tsx
#	app/containers/Passcode/Base/Button.tsx
#	app/containers/RoomHeader/RoomHeader.tsx
#	app/containers/RoomHeader/index.tsx
#	app/containers/RoomTypeIcon.tsx
#	app/containers/SafeAreaView.tsx
#	app/containers/SearchBox.tsx
#	app/containers/StatusBar.tsx
#	app/containers/TextInput.tsx
#	app/containers/ThreadDetails.tsx
#	app/containers/Toast.tsx
#	app/containers/TwoFactor/index.tsx
#	app/containers/markdown/index.tsx
#	app/containers/message/Audio.tsx
#	app/containers/message/Reactions.tsx
#	app/containers/message/Reply.tsx
#	app/containers/message/Urls.tsx
#	app/containers/message/User.tsx
#	app/containers/message/Video.tsx
#	app/containers/message/index.tsx
#	app/containers/message/interfaces.ts
#	app/containers/message/utils.ts
#	app/definitions/IAttachment.ts
#	app/definitions/IMessage.ts
#	app/definitions/IRoom.ts
#	app/definitions/IServer.ts
#	app/dimensions.tsx
#	app/externalModules.d.ts
#	app/i18n/locales/en.json
#	app/i18n/locales/pt-BR.json
#	app/index.tsx
#	app/lib/rocketchat.js
#	app/lib/userPreferences.js
#	app/notifications/push/index.js
#	app/notifications/push/push.android.js
#	app/notifications/push/push.ios.js
#	app/presentation/RoomItem/Actions.tsx
#	app/presentation/RoomItem/IconOrAvatar.js
#	app/presentation/RoomItem/RoomItem.tsx
#	app/presentation/RoomItem/Wrapper.tsx
#	app/presentation/ServerItem/index.tsx
#	app/presentation/TextInput.tsx
#	app/presentation/UnreadBadge/index.tsx
#	app/reducers/selectedUsers.js
#	app/reducers/sortPreferences.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/share.tsx
#	app/stacks/MasterDetailStack/ModalContainer.tsx
#	app/stacks/MasterDetailStack/index.tsx
#	app/stacks/MasterDetailStack/types.ts
#	app/stacks/OutsideStack.tsx
#	app/stacks/types.ts
#	app/theme.tsx
#	app/utils/avatar.js
#	app/utils/base64-js/index.js
#	app/utils/debounce.js
#	app/utils/events.js
#	app/utils/fetch.js
#	app/utils/fileUpload/index.android.js
#	app/utils/fileUpload/index.ios.js
#	app/utils/goRoom.js
#	app/utils/info.js
#	app/utils/isReadOnly.js
#	app/utils/isValidEmail.js
#	app/utils/layoutAnimation.js
#	app/utils/localAuthentication.js
#	app/utils/log/events.js
#	app/utils/log/index.js
#	app/utils/media.js
#	app/utils/messageTypes.js
#	app/utils/navigation/animations.js
#	app/utils/openLink.js
#	app/utils/review.js
#	app/utils/room.js
#	app/utils/server.js
#	app/utils/shortnameToUnicode/ascii.js
#	app/utils/shortnameToUnicode/emojis.js
#	app/utils/shortnameToUnicode/index.js
#	app/utils/sslPinning.js
#	app/utils/theme.js
#	app/utils/touch.js
#	app/utils/twoFactor.js
#	app/utils/url.js
#	app/views/AddExistingChannelView.tsx
#	app/views/AdminPanelView/index.tsx
#	app/views/AttachmentView.tsx
#	app/views/AutoTranslateView/index.tsx
#	app/views/CreateDiscussionView/SelectChannel.tsx
#	app/views/CreateDiscussionView/SelectUsers.tsx
#	app/views/CreateDiscussionView/interfaces.ts
#	app/views/DefaultBrowserView.tsx
#	app/views/DirectoryView/index.tsx
#	app/views/E2EEncryptionSecurityView.tsx
#	app/views/InviteUsersView/index.tsx
#	app/views/LanguageView/index.tsx
#	app/views/LegalView.tsx
#	app/views/MessagesView/index.tsx
#	app/views/ModalBlockView.tsx
#	app/views/NewServerView/ServerInput/Item.tsx
#	app/views/NewServerView/ServerInput/index.tsx
#	app/views/NewServerView/index.tsx
#	app/views/PickerView.tsx
#	app/views/ProfileView/index.tsx
#	app/views/ProfileView/interfaces.ts
#	app/views/RoomInfoView/Direct.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomsListView/Header/Header.js
#	app/views/RoomsListView/index.js
#	app/views/ScreenLockConfigView.tsx
#	app/views/SearchMessagesView/index.tsx
#	app/views/SelectListView.tsx
#	app/views/SelectServerView.tsx
#	app/views/SelectedUsersView.tsx
#	app/views/SettingsView/index.tsx
#	app/views/ShareListView/index.tsx
#	app/views/ShareView/Header.tsx
#	app/views/ShareView/index.tsx
#	app/views/SidebarView/SidebarItem.tsx
#	app/views/SidebarView/index.tsx
#	app/views/StatusView.tsx
#	app/views/ThemeView.tsx
#	app/views/ThreadMessagesView/Dropdown/DropdownItem.js
#	app/views/ThreadMessagesView/Dropdown/DropdownItemFilter.js
#	app/views/ThreadMessagesView/Dropdown/DropdownItemHeader.js
#	app/views/ThreadMessagesView/Dropdown/index.js
#	app/views/ThreadMessagesView/Item.js
#	app/views/ThreadMessagesView/index.js
#	app/views/UserPreferencesView/index.tsx
#	app/views/WorkspaceView/index.tsx
#	e2e/helpers/app.js
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	storybook/stories/RoomItem.js
#	yarn.lock
@lgtm-com

lgtm-com Bot commented Jan 24, 2022

Copy link
Copy Markdown

This pull request introduces 1 alert and fixes 2 when merging 96aa0b2 into 2b87575 - view on LGTM.com

new alerts:

  • 1 for Inefficient regular expression

fixed alerts:

  • 1 for Unused variable, import, function or class
  • 1 for Inefficient regular expression

@diegolmello diegolmello merged commit 14f0108 into single-server Jan 24, 2022
@diegolmello diegolmello deleted the 4.24.0-single-server branch January 24, 2022 20:12
ivnxyz pushed a commit to NextiaDev/Rocket.Chat.ReactNative that referenced this pull request May 26, 2023
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.