PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
38735 commits 1 branch 0 tags 338 MiB
Commit graph

38735 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oliver Pham
0fe133c14f
Merge branch 'matrix-org:develop' into issue-19180 2021-10-10 11:41:21 -04:00
Michael Telatynski
ccba7badff Make public space alias field mandatory again 2021-10-08 14:33:58 +01:00
James Salter
fe79a95731
Merge pull request #6918 from VFermat/fix-19316 
Validate that the phone number verification field is filled before allowing user to submit
 2021-10-08 14:12:28 +01:00
Michael Telatynski
8cb4454ea3 Disable leave room button if user isn't in the room e.g peeking 2021-10-08 13:43:06 +01:00
Michael Telatynski
111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
 2021-10-08 13:00:20 +01:00
James Salter
e1c1d2dc0f
Merge pull request #6840 from wlach/make-placeholder-for-field-grey-no-input 
Make placeholder more grey when no input
 2021-10-08 12:54:57 +01:00
Michael Telatynski
2483f1dc90 Add progress bar to restricted room upgrade dialog 2021-10-08 12:20:43 +01:00
Michael Telatynski
5264b1db9d
Merge pull request #6906 from matrix-org/t3chguy/fix/19246 2021-10-08 10:36:48 +01:00
Michael Telatynski
82ad85a974 Mock usage of getRoomUpgradeHistory in SpaceStore tests 2021-10-08 10:30:46 +01:00
Michael Telatynski
5af72d8d1d
Merge pull request #6917 from LoganArnett/bug/update-save-enabled-by-field 2021-10-08 10:09:54 +01:00
RiotRobot
2a440e90cb v3.32.0-rc.2 2021-10-08 08:32:27 +01:00
RiotRobot
4c1e2e3f3d Prepare changelog for v3.32.0-rc.2 2021-10-08 08:32:25 +01:00
RiotRobot
0af5f8a173 Upgrade matrix-js-sdk to 14.0.0-rc.2 2021-10-08 08:30:34 +01:00
Logan Arnett
4759b4fb5d updating for lint issues 2021-10-07 14:58:35 -04:00
Vitor Eller
0b64dfa59a Alter phone verification button disable label 2021-10-07 15:23:54 -03:00
Logan Arnett
c56d6ba539 updating from boolean to object in order to track if more than one thing is edited 2021-10-07 13:22:43 -04:00
Germain
1e9389429d
Merge pull request #6915 from matrix-org/gsouquet/fix-17068 2021-10-07 17:36:28 +01:00
Germain Souquet
822f73edf7 Remove stale comments in _RoomSublist.scss 2021-10-07 17:28:37 +01:00
Travis Ralston
1a1b178b5b
Merge pull request #6916 from psrpinto/fix/settings-dialog-update-room-name 
Update room settings dialog title when room name changes
 2021-10-07 10:20:05 -06:00
Paulo Pinto
6aa325ed54 Rename method to onRoomName 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-10-07 17:13:57 +01:00
Paulo Pinto
53f26d2744 Keep room name up-to-date in settings dialog 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-10-07 17:04:30 +01:00
Paulo Pinto
ea55b0d45f Add room name to component state 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-10-07 17:01:39 +01:00
Germain
57b919b10a
Delete fixed headerContainer height 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-10-07 16:51:39 +01:00
Paulo Pinto
1b334e47aa
Fix issue that caused the value of certain settings to be inverted (#6896) 
When using the SettingsStore.watchSetting() method for settings which have an
invertedSettingName, the newValueAt argument passed to the callback function,
would erroneously contain the inverted value.

This was making it so that such settings appeared to be disabled when they
should in fact be enabled, or vice-versa. This was however only the case for
code which took in account the newValueAt argument. Code using the newValue
argument was not affected.

The settings which have an invertedSettingName, and were thus potentially
impacted are:

- MessageComposerInput.dontSuggestEmoji
- hideRedactions
- hideJoinLeaves
- hideAvatarChanges
- hideDisplaynameChanges
- hideReadReceipts
- Pill.shouldHidePillAvatar
- TextualBody.disableBigEmoji
- dontSendTypingNotifications
- TagPanel.disableTagPanel
- webRtcForceTURN

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-10-07 16:42:23 +02:00
Michael Telatynski
1b5aef4447
Merge pull request #6311 from matrix-org/t3chguy/a11y/focus-lock-ctx-menu 2021-10-07 13:28:32 +01:00
Michael Telatynski
5dfe53920c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19246 2021-10-07 13:20:06 +01:00
Michael Telatynski
e470d7d030 Make use of MatrixClient::getRoomUpgradeHistory 2021-10-07 13:19:51 +01:00
Michael Telatynski
ad1eb54b4e
Merge pull request #6907 from matrix-org/t3chguy/fix/19304 2021-10-07 11:24:59 +01:00
Michael Telatynski
675c587e03
Merge pull request #6911 from matrix-org/t3chguy/fix/19066 2021-10-07 11:22:01 +01:00
Michael Telatynski
8ee6a08639 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19304 2021-10-07 11:19:12 +01:00
Michael Telatynski
1c8bcce0ed comment 2021-10-07 11:13:13 +01:00
Michael Telatynski
047f182cd8 focusLock only specific context menus 2021-10-07 11:04:10 +01:00
Germain Souquet
c009d15176 Allow the header container to collapse on itself when room list not minimised 2021-10-07 10:57:23 +01:00
Travis Ralston
0f212b2607
Merge pull request #6912 from matrix-org/hs/ignore-greater-pl-scalar 
Scalar messaging: No-op setBotPower if the current PL is greater than the requested PL.
 2021-10-06 10:19:14 -06:00
Michael Telatynski
ab98549fff move the logic to the parent so that the section hiding works 2021-10-06 17:08:32 +01:00
Will Hunt
88410a1b29 Make function async 2021-10-06 17:00:54 +01:00
Michael Telatynski
9ea30a3af4
Merge pull request #6908 from matrix-org/t3chguy/fix/19276 2021-10-06 16:59:33 +01:00
Michael Telatynski
4ac29a431c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19276 2021-10-06 16:53:39 +01:00
Michael Telatynski
54815461fa
Merge pull request #6910 from matrix-org/t3chguy/cp/space-hierarchy 2021-10-06 16:51:35 +01:00
Michael Telatynski
b373b98d48 Simplify aria menu item roles/selectors 2021-10-06 16:49:53 +01:00
Will Hunt
3f6f2bcbb3 no-op a setBotPower request from the integration manager when the PL is equal to or greater to the requested PL 
When configured
 2021-10-06 16:48:17 +01:00
Michael Telatynski
a6c780674a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/focus-lock-ctx-menu 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-10-06 16:39:52 +01:00
Michael Telatynski
52d0b0133c Hide kick & ban options in UserInfo when looking at own profile 2021-10-06 14:46:39 +01:00
Michael Telatynski
a0c0eea4fd Simplify and improve useRoomHierarchy hook 2021-10-06 13:29:27 +01:00
Michael Telatynski
a51847e50a
Merge pull request #6909 from matrix-org/t3chguy/fix/19255 2021-10-06 13:25:03 +01:00
Michael Telatynski
d8bc868e79 Fix spaces keyboard shortcuts not working for last space 2021-10-06 10:56:11 +01:00
Michael Telatynski
79f3348986 Simplify and improve useRoomHierarchy hook 2021-10-06 10:27:16 +01:00
Michael Telatynski
cadc9d2990 Improve emoji shortcodes generated from annotations 2021-10-06 09:47:56 +01:00
Michael Telatynski
fa800796c7 Respect tombstones in locally known rooms for Space children 2021-10-06 09:41:57 +01:00
Michael Telatynski
1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00