Commit Graph

3066 Commits (b1cb2b1d9320af148aa22fb15e126d2fddf421b5)

Author SHA1 Message Date
Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179
 Conflicts:
	src/i18n/strings/en_EN.json
2021-05-11 14:07:47 +01:00
Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Travis Ralston 04d566e247
Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1
Fix voice message playback being squished up against send button
2021-05-07 08:00:45 -06:00
Michael Telatynski 1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994
Improve style of notification badges on the space panel
2021-05-07 13:49:41 +01:00
Michael Telatynski a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski 237399f13e fix button height inconsistency between Chrome & FF 2021-05-07 11:40:39 +01:00
Michael Telatynski 9205b74641 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 2021-05-07 10:25:06 +01:00
Michael Telatynski 03ca7e0107 move notification dot on the space panel up by 1px 2021-05-07 10:22:56 +01:00
Travis Ralston d270e232fd Fix voice message playback being squished up against send button
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
2021-05-06 21:41:04 -06:00
Travis Ralston d531e3d59f
Merge pull request #5971 from matrix-org/travis/files/visual
Update visual style of plain files in the timeline
2021-05-06 10:57:22 -06:00
Michael Telatynski d2fc1c42b0 Improve style of notification badges on the space panel 2021-05-06 15:58:22 +01:00
Michael Telatynski d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
J. Ryan Stinnett 683aec1066
Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski 90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Travis Ralston 2236ec3eff Move and update variable usage 2021-05-05 14:00:56 -06:00
Travis Ralston 60e3a8ac77 Merge branch 'develop' into travis/files/visual 2021-05-05 13:47:33 -06:00
Travis Ralston 3e1265b9bb
Merge pull request #5970 from matrix-org/travis/voicemessages/colors
Update colours and sizing for voice messages
2021-05-05 11:09:18 -06:00
Michael Telatynski 70087b30bf Add disclaimer about subspaces being experimental in add existing dialog 2021-05-05 17:53:31 +01:00
Michael Telatynski 650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Travis Ralston 570c082573 Promote colour to a variable
I refuse to try and type this variable name freehand.
2021-05-05 09:58:45 -06:00
Michael Telatynski 81b97590f6 fix styling of the disabled danger_outline button 2021-05-05 16:51:46 +01:00
Michael Telatynski 7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 16:32:31 +01:00
J. Ryan Stinnett 4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal
Warn on access token reveal
2021-05-05 16:32:12 +01:00
Michael Telatynski acce9a4548 Fix rounded progress bars 2021-05-05 11:50:55 +01:00
Michael Telatynski 07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Travis Ralston ccdc9fbef6 Fix issue where composer styles were being applied to the timeline 2021-05-04 21:15:22 -06:00
Travis Ralston b0cb996cac Update visual style of plain files in the timeline 2021-05-04 21:13:37 -06:00
Travis Ralston a94c1a90c1 Update colours and sizing for voice messages
Fixes https://github.com/vector-im/element-web/issues/17162
2021-05-04 20:45:15 -06:00
Travis Ralston 54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston 2ddc07ed21
Merge pull request #5958 from matrix-org/travis/voicemessages/dark
Support a dark theme for voice messages
2021-05-04 09:03:53 -06:00
Michael Telatynski caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski 4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Michael Telatynski d14ea1bd58 Fix layout issue with expanded space panel 2021-05-04 14:01:10 +01:00
Michael Telatynski c5cbca7c57 Fix edge case with space panel alignment with subspaces on ff 2021-05-04 12:38:55 +01:00
Travis Ralston ba2da6826f Support a dark theme for voice messages
Fixes https://github.com/vector-im/element-web/issues/17137
2021-05-03 16:08:38 -06:00
Travis Ralston 3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Jaiwanth f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
Michael Telatynski 158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski 279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski 1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Travis Ralston 6764b8d645 Change symbol names 2021-04-28 09:29:31 -06:00
Michael Telatynski 5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner 551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Michael Telatynski c0f11fd316 Fix communities spaces beta card layout 2021-04-28 09:35:25 +01:00
Michael Telatynski 18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Michael Telatynski 505b200a87 fix beta pill styling 2021-04-28 08:05:25 +01:00