Merge 4.16.0 into master #3053
Merged
Merge 4.16.0 into master #3053
Conversation
This file contains 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
* Android * iOS
Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com>
* [FIX] REST for Method calls not raising erorrs * Remove unnecessary lint disable
* install react-native-mmkv-storage * wip ios migration * change all js rn-user-defaults -> react-native-mmkv-storage * remove all rn-user-defaults native references (iOS) * android migration from rn-user-defaults to react-native-mmkv-storage * ios app group accessible mmkv * handle get errors * remove access of credentials from legacy native apps * remove data of user defaults * remove no longer necessary import * js mmkv encryption * run migration only once * reply from notification android * fix app group key access at native level ios * encrypt user credentials using a specific key * ios encrypt with random key * use a random key at the first encryption * encrypt migrated data on js land * remove unused function * reply notifications ios should be working * use fix instanceID * android ejson retrieve encrypted data * remove encryption migrated data for a while * encryption working between app and share extension * fix patch react-native-notifications * ssl pinning working using mmkv encrypted data * improve react-native-notifications * run encrypt migration data only once * fix build * fix patches magic string * fix mmkv id * mmkv -> userPreferences * fix instance id on android migration * cast our oldest sharedPreferences string into an object * revert log remove * create currentServer Rocket.Chat key * wrap mmkv api class * change the get logic * move userPreferences to lib * move encrypt migrated data to userPreferences class * check if the new object is new before insert * invalidate ci yarn cache * fix sort migration from android shared preferences * fix splashscreen forever * invalidate yarn cache * invalidate yarn cache * fix patch * Minor change * fix android notifications looking for wrong mmkv instance * Fix some issues on iOS mmkv native access * Remove unnecessary code * Fix notification reply and ssl pinning * WIP NotificationService use MMKV credentials * Add KeychainGroup * Notification idOnly get credentials from mmkv * Some fixes * Invalidate yarn cache * Pods * Use MMKVAppExtension on NotificationService Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Replace font * Use CustomIcon * Remove native assets
* Button to preferences view Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Create screen to preferences and listItem to notifications Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Refactoring NotificationPreferencesView Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * List notification preferences Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Adding translations to labels Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * SetUserPreferences api call Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Saving new user preference in API Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Fix lint Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Add in-app notification test Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Fix in app mentions preference Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Improve object in testInAppNotification Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Removing improper options for NotificationpreferencesView Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Adding API version Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Use redux in UserNotificationPrefView Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Remove in app test Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Use components from another view Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Removing verification for testing in-app notifications Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Move to ProfileView Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Add enterpriseModules on Redux * Fetch enterprise modules and put on redux * hasLicense * Clear modules * Hide omnichannel rooms * Minor refactor * Hide omnichannel toggle * Check license on user status * Apply on search * lint * Look for 'livechat-enterprise' * One module is enough to enable the features * Unhide omnichannel rooms * Sort tweaks * Move omnichannel toggle to RoomsListView * Remove omnichannel toggle from SettingsView * Fix toggle * Ask to enable omnichannel * Lint * Fix issues found on review
* [FIX] User Preferences * PreferencesView -> UserPreferencesView Co-authored-by: Diego Mello <diegolmello@gmail.com>
The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-LODASH-590103 Co-authored-by: Diego Mello <diegolmello@gmail.com>
* create play and foss build * update package.json to generate each build * check1 * requested changes * initial commit * Update config.yml * minor changes * remove bugsnag from foss build * remove bugsnag tasks from foss job * fix stuck screen * fixes * update * fix lint * finalise 🚀 * requested changes * share app for fdroid * update * use negation for builds * requested change * update share app * fix issues due to latest sync * add extra line * fix lint * update * update * fix bugsnag issue * Update config.yml * Fix store url * Foss release instead of debug * Add hold for foss * Fix build * requested changes * update name and icons * update * fix * Revert "Bump version to 4.11.0 (#2392)" This reverts commit ea28798. * finalise Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>
#2423) * [IMPROVEMENT] Add subscription and room events on the same batch queue * Send both params * Unused var
* Logout from other logged in locations * Add UI feedback for the request result * Refactor request to use the proper REST API * Change backgroundColor * I18n Co-authored-by: Diego Mello <diegolmello@gmail.com>
* New field in table of users Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Saving when the user logged in with email and password Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Saving login method info Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Ask for the user to clear cookies Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Fix lint Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Removing loginMethod from redux and add I18n Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Using async/await instead of then/catch Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Fix lint Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Pods * Added dismissText on showConfirmationAlert * Fix iOS * Rename function * I18n tweaks Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Adding missing prop to item object Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Resolving the missing date in the files section in a more elegant way Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * Using ts attribute always inside of an item object Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>
Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>
Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Spotlight issues * Fix room tests * Fix roomactions tests
* [FIX] Logout from custom oauth when using password * Remove an useless const Co-authored-by: Diego Mello <diegolmello@gmail.com>
…2426) * [IMPROVEMENT] Move toggle and inquiry to Enterprise * Move inquiry stream to ee * Emit inquiry subscribe * imports to ee last * Add readme to ee Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
* Update AuthenticationWebView.js * Updated loginTOTP * Added validation * Update rocketchat.js * Update rocketchat.js * Update rocketchat.js * Update rocketchat.js * Fix resolve * Remove incognito * Fix totp being requested on webview Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Add status and teams * Update icons, icon size and getUsersPresence * Minor changes * Refactor RoomTypeIcon * Minor tweaks * Update unit tests * Minor fixes * Fix styles * Small refactor * Update jest Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Update rocketchat and add e2e test for deep linking * Update rocketchat and add e2e test for deep linking * Update deeplinking e2e * fix deep linking auth * Test deep linking auth * Fix deeplink to rid and add tests * Small refactor * Add non existing server test Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Use json * Load only i18n files needed
* Fix clear cache * Write e2e tests * Fix lint * Fix isRTL
* [CHORE] Go to room from hashtag * Layout tweaks Co-authored-by: Diego Mello <diegolmello@gmail.com>
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>
# Conflicts: # __tests__/__snapshots__/Storyshots.test.js.snap # android/app/build.gradle # android/app/src/main/assets/fonts/custom.ttf # app/constants/colors.js # app/containers/Header/index.js # app/containers/MessageBox/Mentions/index.js # app/containers/MessageBox/constants.js # app/containers/MessageBox/index.js # app/containers/RoomTypeIcon.js # app/containers/Status/Status.js # app/containers/Status/index.js # app/containers/UIKit/MultiSelect/Items.js # app/containers/UIKit/MultiSelect/index.js # app/containers/markdown/index.js # app/containers/message/Reply.js # app/i18n/index.js # app/i18n/locales/de.js # app/i18n/locales/en.js # app/i18n/locales/fr.js # app/i18n/locales/pt-BR.js # app/i18n/locales/pt-PT.js # app/i18n/locales/ru.js # app/i18n/locales/zh-CN.js # app/lib/database/model/Subscription.js # app/lib/database/model/migrations.js # app/lib/database/schema/app.js # app/lib/methods/enterpriseModules.js # app/lib/methods/getCustomEmojis.js # app/lib/methods/getPermissions.js # app/lib/methods/getUsersPresence.js # app/lib/methods/helpers/mergeSubscriptionsRooms.js # app/lib/methods/logout.js # app/lib/rocketchat.js # app/lib/selection.json # app/lib/utils.js # app/presentation/RoomItem/Actions.js # app/presentation/RoomItem/RoomItem.js # app/presentation/RoomItem/Touchable.js # app/presentation/RoomItem/TypeIcon.js # app/presentation/RoomItem/index.js # app/presentation/RoomItem/styles.js # app/sagas/deepLinking.js # app/sagas/encryption.js # app/sagas/init.js # app/sagas/login.js # app/sagas/rooms.js # app/share.js # app/stacks/InsideStack.js # app/stacks/MasterDetailStack/index.js # app/utils/avatar.js # app/utils/goRoom.js # app/utils/log/events.js # app/views/AuthenticationWebView.js # app/views/CreateDiscussionView/index.js # app/views/DirectoryView/index.js # app/views/LoginView.js # app/views/NewMessageView.js # app/views/RegisterView.js # app/views/RoomActionsView/index.js # app/views/RoomInfoEditView/index.js # app/views/RoomInfoView/index.js # app/views/RoomInfoView/styles.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.js # app/views/RoomsListView/index.js # app/views/SettingsView/index.js # app/views/SidebarView/index.js # app/views/StatusView.js # app/views/Styles.js # app/views/ThreadMessagesView/index.js # e2e/data.js # e2e/data/data.cloud.js # e2e/data/data.docker.js # e2e/helpers/app.js # e2e/helpers/data_setup.js # e2e/tests/assorted/01-e2eencryption.spec.js # e2e/tests/assorted/02-broadcast.spec.js # e2e/tests/assorted/04-setting.spec.js # e2e/tests/assorted/05-joinpublicroom.spec.js # e2e/tests/assorted/07-changeserver.spec.js # e2e/tests/assorted/08-joinprotectedroom.spec.js # e2e/tests/onboarding/06-roomslist.spec.js # e2e/tests/room/02-room.spec.js # e2e/tests/room/03-roomactions.spec.js # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # ios/custom.ttf # package.json # storybook/stories/Avatar.js # storybook/stories/Message.js # storybook/stories/RoomItem.js # storybook/stories/RoomViewHeader.js # storybook/stories/index.js # yarn.lock
|
This pull request introduces 1 alert when merging f6e6ab3 into f5b013f - view on LGTM.com new alerts:
|
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.
Proposed changes
Issue(s)
How to test or reproduce
Screenshots
Types of changes
Checklist
Further comments