Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622
2021-05-13 16:12:42 +01:00
Michael Telatynski
6aa477f0f5
Decorate room avatars with publicity in add existing to space flow
2021-05-13 14:23:28 +01:00
Michael Telatynski
76afc1100a
Convert to Typescript and move from ClientPeg to Context
2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61
tweak reactions row some more, third try lucky
2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025
Tweak alignment of reactions row, move add reaction to right and only show on hover
2021-05-13 13:32:38 +01:00
Michael Telatynski
b5fa4d88bf
Add extra add reactions button to encourage more diverse reactions to content
2021-05-13 10:56:51 +01:00
Michael Telatynski
3af0138e9d
Update emoji icons to new style
2021-05-13 10:28:35 +01:00
Michael Telatynski
423c515708
Consolidate AddExistingToSpace between Dialog and Just Me integrated flow
2021-05-13 09:46:45 +01:00
Michael Telatynski
565e41c3df
Extract UntrustedDeviceDialog and fix e2ee icon
2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
Michael Telatynski
03bd30d125
Fix colours used for the back button in space create menu
2021-05-12 10:48:06 +01:00
Michael Telatynski
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238
...
Add feedback mechanism for beta features, namely Spaces
2021-05-11 17:46:21 +01:00
Michael Telatynski
7396ce76e5
Tweak the feedbacks a tad
2021-05-11 17:30:33 +01:00
Travis Ralston
b1d5dc1194
Merge pull request #5993 from matrix-org/travis/voicemessages/scale
...
Scale voice message clock with user's font size
2021-05-11 10:25:36 -06:00
Michael Telatynski
bf4c8f048f
Add feedback mechanism for beta features
2021-05-11 15:58:19 +01:00
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
Robin Townsend
7efbd2d930
Hide unencrypted badge from ForwardDialog preview
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:57:47 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Robin Townsend
bfba2b0b6f
Push ForwardDialog scrollbar into the gutter
...
…to give more space between it and the buttons.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 11:16:51 -04:00
Robin Townsend
b9b237fc9a
Replace forwarding UI with dialog
...
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Travis Ralston
b56d7c9ae8
Scale voice message clock with user's font size
...
Fixes https://github.com/vector-im/element-web/issues/17185
2021-05-07 19:27:52 -06: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
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
9205b74641
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
2021-05-07 10:25:06 +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
Tulir Asokan
cc919452b5
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-05-07 00:07:51 +03: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
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
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
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
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
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
Ayush PS
b42872daa4
Fixed the Dial Pad and finalized the changes
2021-05-02 22:10:15 +05:30
Tulir Asokan
09f9916916
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-05-01 15:37:32 +03:00
Jaiwanth
f766f985e4
Change cursor to not-allowed
2021-04-30 08:25:58 +05:30
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