Commit graph

33144 commits

Author SHA1 Message Date
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski
2e86d53cd1
Merge pull request #6027 from matrix-org/t3chguy/fix/i80
Encourage more diverse reactions to content
2021-05-13 16:01:28 +01:00
Michael Telatynski
a41d76b588 fix typos 2021-05-13 14:14:01 +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
712bdba09f
Merge pull request #6026 from matrix-org/t3chguy/fix/17281
Wrap decodeURIComponent in try-catch to protect against malformed URIs
2021-05-13 12:45:57 +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
dd04b479a1 Wrap decodeURIComponent in try-catch to protect against malformed URIs 2021-05-13 10:20:27 +01:00
Michael Telatynski
52420feab0
Merge pull request #6021 from matrix-org/t3chguy/fix/17268
Iterate beta feedback dialog
2021-05-12 17:42:42 +01:00
Michael Telatynski
236fcecf9c i18n 2021-05-12 17:13:23 +01:00
Michael Telatynski
5430f44c27 Convert verification and UntrustedDeviceDialog to TS 2021-05-12 17:08:44 +01:00
Michael Telatynski
565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00
Michael Telatynski
378d0b264b
Merge pull request #6020 from matrix-org/t3chguy/disable-space-fields-busy
Disable space fields whilst their form is busy
2021-05-12 16:18:44 +01:00
Michael Telatynski
607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski
2c89be312a Disable space fields whilst their form is busy 2021-05-12 13:30:00 +01:00
J. Ryan Stinnett
5d02e44293
Merge pull request #6018 from matrix-org/jryans/beta-feedback-nbsp
Add missing space on beta feedback dialog
2021-05-12 12:42:42 +01:00
Michael Telatynski
045646bf33
Merge pull request #6017 from matrix-org/t3chguy/fix/17255
Fix colours used for the back button in space create menu
2021-05-12 12:40:07 +01:00
J. Ryan Stinnett
23869cdaa7 Add missing space on beta feedback dialog 2021-05-12 12:32:39 +01:00
Germain
91133ed35b
Prioritise and reduce the amount of events decrypted on application startup (#5980) 2021-05-12 12:19:53 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +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
eea6ba6825
Merge pull request #6015 from matrix-org/t3chguy/fix/17252
Linkify topics in space room directory results
2021-05-12 10:35:31 +01:00
Michael Telatynski
2c2d95560b Linkify topics in space room directory results 2021-05-12 10:05:53 +01:00
Travis Ralston
7bd1a2b87f
Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state
Persistent space collapsed states
2021-05-11 23:23:48 -06:00
Šimon Brandner
262fc40afb
Move comment to the correct place
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-12 07:12:00 +02:00
Travis Ralston
9842bcde50
Merge pull request #6010 from ndarilek/develop
Catch another instance of unlabeled avatars.
2021-05-11 21:44:15 -06: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
352937de11
Merge pull request #5996 from matrix-org/travis/voicemessages/resample2
Rescale and smooth voice message playback waveform to better match expectation
2021-05-11 10:28:33 -06: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
Travis Ralston
b1cb2b1d93 Fix bad merge 2021-05-11 10:19:09 -06:00
Travis Ralston
d8e3458c55 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2 2021-05-11 10:15:37 -06:00
Travis Ralston
8d5b2d63dd
Merge pull request #5995 from matrix-org/travis/voicemessages/indev
Remove "in development" flag from voice messages
2021-05-11 10:13:42 -06:00
Travis Ralston
92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Travis Ralston
d1cfde6f12
Merge pull request #5989 from matrix-org/travis/voicemessages/safari
Support voice messages on Safari
2021-05-11 10:12:31 -06:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
J. Ryan Stinnett
03bb3cc951
Merge pull request #6011 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-05-11 16:31:41 +01:00
Weblate
350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Nolan Darilek
006aa2d5b9 Catch another instance of unlabeled avatars.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-05-11 09:39:06 -05:00
Michael Telatynski
6efc162ce9
Merge pull request #5978 from matrix-org/t3chguy/fix/17179
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-11 14:36:12 +01:00
Michael Telatynski
6ece4ef2ab i18n 2021-05-11 14:08:09 +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
c4118f1059
Merge pull request #5933 from matrix-org/t3chguy/fix/17021
Spaces Beta release
2021-05-11 13:58:50 +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
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359
Improve permissions error when adding new server to room directory
2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00
Michael Telatynski
2b2e74b65e
Merge pull request #6006 from matrix-org/t3chguy/fix/17227
Allow user to progress through space creation & setup using Enter
2021-05-11 12:02:14 +01:00