Verji-Element-App v2 - Sync Upstream(new fork), Merge our forked matrix.react-sdk#28788

Closed

JohnSimonsen wants to merge 397 commits intoelement-hq:developfrom verji:verji-merge-react-sdk

+28,347-943

This pull request is big! We're only showing the most recent 250 commits

Commits on May 16, 2024

feat: Add InsertTrailingColonSetting UI feature TBC...
Reza Mohseni
committed
Solution alternative / issue identified -JT
John Tore Simonsen
committed

Commits on May 21, 2024

feat: Add ShowJoinLeavesSetting UI feature. Added tests, and fixed old tests.
Reza Mohseni
committed
feat: Add ShowChatEffectSetting UI feature. added tests.
Reza Mohseni
committed
feat: Add feature flags for ShowStickersButton, InsertTrailingColon, ShowJoinLeaves, and ShowChatEffect UI settings. code cleanup and restructure.
Reza Mohseni
committed
Merge branch 'develop' into verji-develop
eiksta
committed

Commits on May 23, 2024

Commits on May 28, 2024

Commits on May 31, 2024

added customwrapper for ReactionsRowButtonTooltip, and wrote test from scratch. ran prettier on 6 files.
Reza Mohseni
committed
ran eslint on 6 files
Reza Mohseni
committed
Merge branch 'verji-develop' of https://github.com/verji/matrix-react-sdk into rm/1921-HoC-part3
Reza Mohseni
committed
chore: Update import path for MatrixClient in ReactionsRowButtonTooltip-test
Reza Mohseni
committed

Commits on Jun 3, 2024

update posthog (needed get_property) on PostHogPersitence
John Tore Simonsen
committed
Merge pull request element-hq#42 from verji/jts/customComponentLifecycles-part1
JohnSimonsen
authored
Merge remote-tracking branch 'origin/verji-develop' into rm/1921-HoC-part3
John Tore Simonsen
committed
revert package json
John Tore Simonsen
committed
eslint / prettier
John Tore Simonsen
committed
Merge pull request element-hq#43 from verji/rm/1921-HoC-part3
JohnSimonsen
authored

Commits on Jun 5, 2024

Commits on Jun 6, 2024

Commits on Jun 9, 2024

Commits on Jun 10, 2024

Commits on Jun 11, 2024

feat: Enable "UIFeature.AddSubSpace" feature in SpaceContextMenu. added test
Reza Mohseni
committed

Commits on Jun 13, 2024

Commits on Jun 14, 2024

fixed bug
eiksta
committed

Commits on Jun 17, 2024

Commits on Jun 18, 2024

feat: added UIFeature.AddExistingRoomToSpace in RoomList component. added tests.
Reza Mohseni
committed

Commits on Jun 19, 2024

Commits on Jun 20, 2024

Commits on Jun 24, 2024

1873 Remove possibility for user to send message room|persons (element-hq#60 )
eiksta
authored

Commits on Jun 25, 2024

Commits on Jun 26, 2024

Commits on Jun 28, 2024

Commits on Jul 1, 2024

ran prettier on RoomInfoLine component
Reza Mohseni
committed
Merge pull request element-hq#64 from verji/rm/1968-Hierarchy-UX-8
JohnSimonsen
authored
can now add existing and already onboarded users
John Tore Simonsen
committed

Commits on Jul 2, 2024

remove logging
John Tore Simonsen
committed
Merge pull request element-hq#65 from verji/jts/fix-verji-onbaording
JohnSimonsen
authored

Commits on Jul 4, 2024

chore: Add option to show/hide "Leave space" in context menu. created tests
Reza Mohseni
committed
Merge branch 'verji-develop' of https://github.com/verji/matrix-react-sdk into develop
Reza Mohseni
committed
Revert "Merge branch 'verji-develop' of https://github.com/verji/matrix-react-sdk into develop"
Reza Mohseni
committed
reverted a bad commit.
Reza Mohseni
committed

Commits on Jul 5, 2024

Commits on Aug 1, 2024

Eik/hide possiblity to send message (element-hq#68 )
eiksta
authored

Commits on Aug 12, 2024

Eik/reactivate securitytab (element-hq#69 )
eiksta
authored
Eik/reactivate securitytab (element-hq#70 )
eiksta
authored
fix build errors
John Tore Simonsen
committed
eslint / prettier
John Tore Simonsen
committed
Merge pull request element-hq#71 from verji/jts/fix-build-issues
JohnSimonsen
authored

Commits on Aug 14, 2024

Generate a string arary of userIds in current space, and use list to filter suggestions list and recent list.
John Tore Simonsen
committed
fix type-o
John Tore Simonsen
committed

Commits on Aug 15, 2024

Commits on Aug 16, 2024

hardcode verji org in install deps script
John Tore Simonsen
committed
trigger change
John Tore Simonsen
committed
modify install-deps to install matrix-react-sdk-module-api from verji-develop
John Tore Simonsen
committed
add comment
John Tore Simonsen
committed
trigger
John Tore Simonsen
committed
fix path to install module api
John Tore Simonsen
committed
trigger
John Tore Simonsen
committed
build module-api
John Tore Simonsen
committed
trigger
John Tore Simonsen
committed
build module-api
John Tore Simonsen
committed
trigger
John Tore Simonsen
committed
try without frozen lock file in module-api
John Tore Simonsen
committed
trigger
John Tore Simonsen
committed
WIP: Attempt to fix merge hell where changes got lost
thoraj
committed
Merge tag 'v3.100.0' into taj/verji-develop-2
thoraj
committed
Fix issues after upgarding/merging in v3.100.0
thoraj
committed
Fix issues after bringing in (merging) 3.100.0
thoraj
committed
fix issues after syncing with upstream 3.100.0
thoraj
committed
Merge remote-tracking branch 'origin/verji-develop' into jts/verji-develop-2-merge
John Tore Simonsen
committed

Commits on Aug 18, 2024

applied invite and confirm dialog css
Reza Mohseni
committed

Commits on Aug 19, 2024

Merge pull request element-hq#77 from verji/jts/verji-develop-2-merge
JohnSimonsen
authored

Commits on Aug 20, 2024

Merge pull request element-hq#72 from verji/jts/1989-invite-suggestions
JohnSimonsen
authored
trigger
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
prettier
John Tore Simonsen
committed
Merge remote-tracking branch 'origin/jts/github-acions' into jts/github-action-trigger-branch
John Tore Simonsen
committed
edit scripts
John Tore Simonsen
committed
use verji instead of vector-im in script
John Tore Simonsen
committed
attempt skip
John Tore Simonsen
committed
skip failing test due to verji-customisations
John Tore Simonsen
committed

Commits on Aug 21, 2024

Merge branch 'verji-develop' into jts/github-action-trigger-branch
JohnSimonsen
authored

Commits on Aug 23, 2024

fix invite dialog tests
John Tore Simonsen
committed
lint fix
John Tore Simonsen
committed
update snapshots
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
prettier
John Tore Simonsen
committed
Merge pull request element-hq#81 from verji/jts/github-action-trigger-branch
JohnSimonsen
authored
update snapshot
John Tore Simonsen
committed
fix tests
John Tore Simonsen
committed
increase timeout of test
John Tore Simonsen
committed
see if timeout is really the issue
John Tore Simonsen
committed
mock rust sdk feature flag in tests, because we have hardcoded feature to false in verji.
John Tore Simonsen
committed
eslint and prettier
John Tore Simonsen
committed
Eik/hide labs and sharedinvites (element-hq#84 )
eiksta
authored
link module-api in layered sh.
John Tore Simonsen
committed
Revert "Eik/hide labs and sharedinvites (element-hq#84 )"
JohnSimonsen
authored
Merge pull request element-hq#85 from verji/revert-84-eik/hide_labs_and_sharedinvites
JohnSimonsen
authored
trigger tests
John Tore Simonsen
committed

Commits on Aug 26, 2024

Skip failing checks we don't have time to fix now
John Tore Simonsen
committed
Merge pull request element-hq#83 from verji/jts/github-action-trigger-branch
JohnSimonsen
authored

Commits on Aug 27, 2024

Commits on Aug 28, 2024

Eik/hide labs and sharedinvites (element-hq#86 )

eiksta
and
John Tore Simonsen
authored
Eik/hide labs and sharedinvites (element-hq#89 )

eiksta
and
John Tore Simonsen
authored
add translations for usermenu-module
John Tore Simonsen
committed

Commits on Aug 29, 2024

Eik/hide labs and sharedinvites (element-hq#90 )

eiksta
and
John Tore Simonsen
authored
Eik/hide labs and sharedinvites (element-hq#91 )

eiksta
and
John Tore Simonsen
authored
Feature flag for "inviteToSpace"-button with tests
John Tore Simonsen
committed
Merge remote-tracking branch 'origin/verji-develop' into jts/1998-invite-to-space
John Tore Simonsen
committed
Merge pull request element-hq#92 from verji/jts/1998-invite-to-space
JohnSimonsen
authored

Commits on Aug 30, 2024

Eik/hide labs and sharedinvites (element-hq#93 )

eiksta
and
John Tore Simonsen
authored

Commits on Sep 10, 2024

push before ssd swap
John Tore Simonsen
committed

Commits on Sep 17, 2024

2010 Add News and Operatting messages as a component
eiksta
committed

Commits on Sep 18, 2024

Working userSearch, w/o suggestions (invitedialog/spotlight)
John Tore Simonsen
committed
remove logging
John Tore Simonsen
committed
prettier and eslint
John Tore Simonsen
committed

Commits on Sep 19, 2024

Commits on Sep 20, 2024

added tests, new feature flag for hiding "recents" in invite dialog suggestions
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
Merge pull request element-hq#94 from verji/jts/2006-improve-search
JohnSimonsen
authored

Commits on Sep 25, 2024

Commits on Oct 1, 2024

Metaspace Other rooms(MetaSpace.Orphans) now also affected by feature flags: UIFeature.ShowPlusMenuForMetaSpace, UIFeature.ShowStartChatPlusMenuForMetaSpace & UIFeature.ShowAddRoomPlusMenuForMetaSpace
John Tore Simonsen
committed

Commits on Oct 2, 2024

eslint / prettier
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
Merge pull request element-hq#95 from verji/jts/2039-hide-other-rooms+
JohnSimonsen
authored

Commits on Oct 4, 2024

Only follow default validation flow of valid size of export, when ExportDefaultSizeLimit - is default value (true)
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
Merge pull request element-hq#96 from verji/jts/2055-export-chat
JohnSimonsen
authored

Commits on Oct 8, 2024

1943 - verji changes
eiksta
committed

Commits on Oct 9, 2024

2010 News component
eiksta
committed

Commits on Oct 14, 2024

Remove Customisations in "InviteDialog"
John Tore Simonsen
committed

Commits on Oct 15, 2024

run eslint
John Tore Simonsen
committed
fix TabbedView
John Tore Simonsen
committed
Skip tests in regards to Verji UIFeature flags
John Tore Simonsen
committed
revert manipulated test to original form
John Tore Simonsen
committed
remove comments
John Tore Simonsen
committed
2010 News component
eiksta
committed
Merge remote-tracking branch 'origin/verji-develop' into jts/2059-invitedialog-custom-component-hook
John Tore Simonsen
committed
trigger change
John Tore Simonsen
committed
Merge pull request element-hq#97 from verji/jts/2059-invitedialog-custom-component-hook
JohnSimonsen
authored

Commits on Nov 6, 2024

Add feature flag: UIFeature.AllowDirectUserInvite
John Tore Simonsen
committed
Merge pull request element-hq#98 from verji/jts/2090-allowDirectUserIdInvite
JohnSimonsen
authored

Commits on Nov 13, 2024

2080 Translations in web client when inviting
eiksta
committed

Commits on Nov 15, 2024

Add feature flag for searchInAllRooms
John Tore Simonsen
committed
eslint
John Tore Simonsen
committed
skip non-crucial tests
John Tore Simonsen
committed
Merge pull request element-hq#99 from verji/jts/2100-UIFeature-searchInAllRooms
JohnSimonsen
authored

Commits on Nov 26, 2024

2113 Change "Folk" to "Personer"
eiksta
committed

Commits on Nov 28, 2024

add feature flag for "Leave Space"
John Tore Simonsen
committed
Merge pull request element-hq#101 from verji/jts/UIFeature.LeaveSpaceButton
JohnSimonsen
authored

Commits on Dec 13, 2024

Improve error message when not permission to invite to tenant
John Tore Simonsen
committed
Merge branch 'verji-develop' of https://github.com/verji/matrix-react-sdk into verji-develop
John Tore Simonsen
committed

Commits on Dec 20, 2024

Merge remote-tracking branch 'matrix-react-sdk/verji-develop' into verji-merge-react-sdk
John Tore Simonsen
committed