Commit graph

34427 commits

Author SHA1 Message Date
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
RiotRobot
392505e7a1 v3.21.0-rc.1 2021-05-11 16:36:53 +01:00
RiotRobot
657481156f Prepare changelog for v3.21.0-rc.1 2021-05-11 16:36:52 +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
RiotRobot
965b0ab58d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:28:00 +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
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
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
c-cal
5b9b878808 Translated using Weblate (French)
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-11 10:34:32 +00:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:13:13 +02:00
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet
be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
J. Ryan Stinnett
f74d4769ca
Merge pull request #6008 from matrix-org/jryans/upgrade-sanitize-types
Upgrade sanitize types
2021-05-11 09:49:22 +01:00
J. Ryan Stinnett
49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +01:00
J. Ryan Stinnett
f3f6bf7c8f
Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade
Upgrade `cheerio` and resolve type errors
2021-05-11 09:35:48 +01:00
Michael Telatynski
5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:37:53 +05:30
Travis Ralston
7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands
Add slash commands support to edit message composer
2021-05-10 20:16:44 -06:00
Travis Ralston
392cde719c
Merge pull request #5940 from DantrazTrev/err
Fix the two todays problem
2021-05-10 20:15:06 -06:00
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06: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
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -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
J. Ryan Stinnett
3e68d73597 Upgrade sanitize types 2021-05-10 17:43:10 +01:00
J. Ryan Stinnett
7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet
c96f11db7d appease linter 2021-05-10 17:22:33 +01:00
J. Ryan Stinnett
9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00