Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.14.1 into single-server #2892

Merged
merged 30 commits into from
Feb 10, 2021
Merged

Merge 4.14.1 into single-server #2892

merged 30 commits into from
Feb 10, 2021

Conversation

diegolmello
Copy link
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

gerzonc and others added 29 commits January 7, 2021 11:50
@gerzonc
[FIX] RoomItem using deprecated animated event signature (#2771)
5d2050b
@gerzonc
[FIX] Server autocomplete text breaking line (#2774)
59fd703
@gerzonc @diegolmello
[FIX] ServerDropdown flashing bigger server icon (#2775)
3b4f457 
* [FIX] ServerDropdown flashing bigger server icon

* Remove unused logo and update image path where needed

* Minor tweak

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Rooms list not being updated on some cases (#2765)
7f0abe1 
* Request subscriptions on RoomsListView.constructor

* Removes opened rooms from last message persisting

* Change server reducer

* Prevent undefined ids causing query error
@diegolmello
[FIX] Share Extension hitting memory limit on iOS (#2788)
32b1b36 
* [FIX] Disallow swipe to dismiss on share extension

* Limit query to 20 and clean up props

* Remove rn-extension-share branch pointer

* Test new branch

* Remove branch
@djorkaeffalexandre @diegolmello
[IMPROVEMENT] Threads layout tweaks (#2686)
4d13689 
* improvement: Thread Details

* fix: re-render Thread Messages Item

* fix: update snapshots

* improve: thread details component

* fix: cast replies length

* improvement: format date of threads

* improvement: thread details styles

* fix: wrap text

* tests: update snapshot

* improvement: use same date format for all dates

* Icon size 24

* Remove date

* Remove prop drill

* Badge position

* Badge container tweak

* Fix inline style

* Move ThreadDetails to containers

* Update stories

* Fix lint

* Remove wrong prop

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[CHORE] Remove some migrations (#2792)
6457546 
* Remove force rooms refresh

* Remove MMKV migration
@diegolmello
Bump version to 4.14.0 (#2797)
0330219
@diegolmello
[FIX] Messagebox tracking lost on pop gesture navigation (#2799)
b77603c 
* Use setTimeout instead of InteractionManager

* Update tracking lib
@diegolmello
[FIX] Back button closing activity when on root stack screen (#2804)
a51a985 
* Make hardware back button to behave as home button on root screens

* Remove unnecessary code

* Remove handleBackPress from OnboardingView

* Fix lint
@phriedrich @diegolmello
[i18n] Add missing German strings (#2715)
a1bd97f 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[NEW] Encrypted Discussions (#2813)
db5074a 
* I18n key fix

* Add encrypted switch

* Remove unused i18n keys

* Add enabled to encryption reducer

* Show encrypted option on CreateDiscussionView only when e2e encryption is properly set

* Add localSearch and use it on search

* Use encrypted from parent channel

* Fix method calls as rest api with 2fa enabled

* Fix logout after reset keys

* Use encryption reducer instead of lib directly to check render

* Check for room type logic to display encryption option on create discussion

* Check toggle-room-e2e-encryption permission on RoomActionsView

* Check for encryption status instead of setting on server

* Fix

* Disable switch instead of hide it

* Fix spotlight for DMs

* Fix server test
@yash-rajpal @diegolmello
[FIX] Messagebox missing style for text color (#2786)
4b96d30 
* Changing auxilaryTintColor

* Changed Placeholder color to BodyText color

* added color prop

* eslint changes

* used array for styles

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@faziloub @diegolmello
[I18N] Update arabic (#2696)
54f3fb9 
* Update ar.js

* Update ar.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@sumukhah @diegolmello
[FIX] Workspace input without i18n (#2689)
61bc2a4 
* [FIX] Translation of strings in Login page

* Strings are added for translation.

fixes: #2620

* Add pt-BR

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] Spotlight returning duplicated entries (#2805)
d83631d 
* Update rocketchat.js

* Updated search function

* Minor improvements

* Remove atIndex

* Add remove logic to remove duplicate data from response

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[CHORE] Refactor ServerItem (#2778)
8d1dd27 
* Updated ServerDropdown and ServerItem

* Added ServerItem stories

* Update ServerDropdown.js

* Updated ServerItem stories

* Updated ServerItem stories and ServerItem component

* Updated SelectServerView, ServerItem and ServerItem stories

* Updated ServerItem stories

* Updated ServerItem stories

* Update tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@yash-rajpal @diegolmello
[DOCS] Updated Quick Start docs link in e2e/readme (#2802)
af34e5a 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@mukerremyilmaz @diegolmello
[I18N] Add Turkish (#2793)
8abc3a8 
* Turkish language support added

* Update tr.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Lint on #2793 (#2818)
94d94cf
@phriedrich
[I18N] Add missing german strings (#2689) (#2820)
e2d0a00
@aenonGit
[I18N] Add missing italian strings (#2817)
f0046f6
@diegolmello
[FIX] Server version becoming null on server change (#2821)
0fdb8f2
@gerzonc @diegolmello
[FIX] Wrong styling on E2E encryption banner (#2767)
bd09cd3 
* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner (#2767)

* Updated SortDropdown, ListHeader, ListItem and added stories for List.Item

* Updated SortDropdown

* Removed unused component

* Updated List.Item and stories

* Reverted unnecessary changes and updated ListItem stories

* Fix minor indentation

* Stop breaking Touch's default underlay color

* Fix indentation

* Remove falsy comparison from render

* Fix left icon

* Use List.Item on OmnichannelStatus

* Add missing separator

* Lint

* Fix sort dropdown

* Remove unnecessary styles

* Fix detox

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] App Store using Experimental's app id (#2826)
b10c5db
@diegolmello
[FIX] Wrong username on push notifications (#2825)
cf59644
@diegolmello
[FIX] Share extension memory issues on iOS (#2845)
acd5f04 
* Remove unnecessary class prop

* Stop rendering servers when there's only one

* Map and alloc only necessary columns from query

* Fetch servers count instead of all servers records

* Fetch only needed servers

* Separators

* Remove renderContent

* Minor fix

* Refactor query

* Smaller avatars in memory

* Fix getItemLayout

* Add topic

* Load less pods

* tests

* Import only used functions from lodash

* Fix pods

* Import only used functions from semver

* Fix media sharing

* Update pods

* Disables preview and thumb on iOS

* Update expo-video-thumbnail

* Unnecessary change
@ARKEOLOGIST @diegolmello
[FIX] Logout from other locations not prompting confirmation option (#…
bdc495d 
…2854)

* Fixed logout toast bug for the iOS

* Removing callToAction and replacing with confirmationText

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
Bump version to 4.14.1 (#2859)
d42dab1
@diegolmello
Merge branch 'develop' into single-server-4.14.1
5687556 
# Conflicts:
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	app/constants/links.js
#	app/views/RoomActionsView/index.js
#	app/views/SelectServerView.js
#	app/views/ShareListView/index.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	yarn.lock
@diegolmello diegolmello merged commit 322dabc into single-server Feb 10, 2021
@diegolmello diegolmello deleted the single-server-4.14.1 branch February 10, 2021 13:35
@lgtm-com
Copy link

lgtm-com bot commented Feb 10, 2021

This pull request fixes 1 alert when merging 5687556 into d8cb5df - view on LGTM.com

fixed alerts:

  • 1 for Unused variable, import, function or class

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
💎 release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@diegolmello @gerzonc @djorkaeffalexandre @phriedrich @yash-rajpal @faziloub @sumukhah @mukerremyilmaz @aenonGit @ARKEOLOGIST