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.

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

chore: Merge 4.48.0 into single-server #5672

Merged
merged 16 commits into from
Apr 30, 2024
Merged

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

diegolmello and others added 16 commits March 21, 2024 15:53
Co-authored-by: GleidsonDaniel <gleidson10daniel@hotmail.com>
* copy usename on longpress

* copy name too

---------

Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
* feat: change default browser label

* action: organized translations

---------

Co-authored-by: GleidsonDaniel <GleidsonDaniel@users.noreply.github.com>
* chore: remove auxiliaryText color

* chore: remove titleText

* chore: password colors change

* chore: use fontDefault on ActionSheet item

* wip: type

* chore: set custom icon default color

* remove tintActive color

* only set color when checked

* remove icon color

* remove tintActive

* chore: remove STATUS_COLORS

* chore: remove mentions colors

* chore: remove switch color

* chore: background color

* chore: auxiliaryBackground

* chore: one local colors

* wip: some colors

* wip: colors

* wip: colors

* wip: end colors

* test: update

* chore: fix some colors

* chore: fix lint

* chore: back to text props

* chore: fix ts errors

* revert

* chore: fix lint

* test: update snapshot

* update storybook

* cocoapods

* fix app theme color

* remove unused color

* fix login service button color

* remove unused color

* unused backgroundColor

* fix background color

* fix transparent color

* fix background color

* wip: key

* fix color

* chore: revert to 1 tick

* test: update

* chore: use same color as front end

* test: update

* fix radius

* fix background color

* fix wrong color

* change some colors

* chore: update stories

* chore: fix button style

* chore: fix item color

* lint

* update snapshot

* link

* remove background color

* change send to channel color

* call icons

* video conf colors

* fix app default color

* bottom sheet

* remove background

* two factor color

* update tests

* feat: add force-logout stream listener

* remove icon colors

* improve badge color

* update tests

* fix header colors

* fix collapsible icon color

* imagePreview color

* wip

* update test

* lint

---------

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* chore: update currentFilter value in ThreadMessagesView

* feat: save ThreadMessagesView filter preferences on mmkv
* feat: add Czech translation

* action: organized translations

* feat: add cs option

---------

Co-authored-by: GleidsonDaniel <GleidsonDaniel@users.noreply.github.com>
* chore: change shareview and loading image/videos colors

* test: update snapshot

* fix: change header color

* chore: improve videoconf base color
* feat: add force-logout stream listener

* Update app/lib/services/connect.ts
* fix: disable auto save draft on ShareView screen

* fix: remove unnecessary logic for draft saving

* fix: checks if any text has been changed before saving the draft on return

* chore: fix React warn (dont call state on unmonted component)

* chore: remove unnecessary console.log

* unmount hack

* wip
# Conflicts:
#	app/views/ChangeAvatarView/index.tsx
#	app/views/RoomsListView/Header/Header.tsx
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello diegolmello merged commit 29ef8e2 into single-server Apr 30, 2024
3 of 5 checks passed
@diegolmello diegolmello deleted the 4.48.0-single-server branch April 30, 2024 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants