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

Absorb matrix-react-sdk/verji-develop into element-web/verji-develop #1

Open
wants to merge 397 commits into
base: verji-develop
Choose a base branch
from

Conversation

JohnSimonsen
Copy link

element-web-v2 is a fresh new fork which is up to date with upstream

  • This means that the upstream already has absorbed the upstream matrix-react-sdk
  • We are now attempting to merge our matrix-react-sdk/verji-develop ontop of this fork
  • The result should be a fork which is up to date with upstream, and has our custom code (module-hooks, feature-flags etc)

Reza Mohseni and others added 30 commits May 16, 2024 14:29
…ShowJoinLeaves, and ShowChatEffect UI settings. code cleanup and restructure.
* 1898 New Ui-features (Accountdata)
1899 New Ui-features (div1)

* 1898 New Ui-features (Accountdata)
1899 New Ui-features (div1)

* 1898 New Ui-features (Accountdata)
1899 New Ui-features (div1)

* 1898 New Ui-features (Accountdata)
1899 New Ui-features (div1)

* 1902 New Ui-features (div2)

* 1902 New Ui-features (div2)

* 1902 New Ui-features (div2)

* 1902 New Ui-features (div3)

* 1902 New Ui-features (div3)

* 1902 New Ui-features (div4)

* 1902 New Ui-features (div4)

* 1902 New Ui-features (div4)

* 1902 New Ui-features (div4), test to fix matrix tests

* 1902 New Ui-features (div4), test to fix matrix tests

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* 1914 New Ui-features (div5)

* new uifeature account div1 checking

* new uifeature account div1 checkin

* new uifeature account div1 checkin

* new uifeature account div1 checkin

* new uifeature account div1 checkin

* new uifeature account div1 checkin

* new uifeature account div1 checkin

* new uifeature account div1 checkin
eiksta and others added 28 commits October 9, 2024 13:29
Add customComponent lifecycle hook to Invite dialog
…tom-component-hook

Remove Customisations in "InviteDialog"
2078 Fix room invite text
…dInvite

Add feature flag: UIFeature.AllowDirectUserInvite
…InAllRooms

Add feature flag for searchInAllRooms
…Button

Add feature flag for "Leave Space"
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.

3 participants