Commit graph

33086 commits

Author SHA1 Message Date
libexus
f595813e21 Translated using Weblate (German)
Currently translated at 99.1% (2935 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-14 04:37:29 +00:00
Priit Jõerüüt
68fcc259d0 Translated using Weblate (Estonian)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-05-12 20:28:27 +00:00
waclaw66
3169f75e90 Translated using Weblate (Czech)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-05-12 20:28:19 +00:00
Jeff Huang
9e981ae118 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-05-12 20:28:11 +00:00
jelv
7be918f527 Translated using Weblate (Dutch)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-05-12 20:28:03 +00:00
Szimszon
61f90cdc45 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-05-12 20:27:55 +00:00
Thibault Martin
93ca9e6891 Translated using Weblate (French)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-12 20:27:48 +00:00
iaiz
bf9dd05b3c Translated using Weblate (Spanish)
Currently translated at 99.8% (2956 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-05-12 20:27:41 +00:00
libexus
c9988d59a1 Translated using Weblate (German)
Currently translated at 99.3% (2939 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-12 20:27:33 +00:00
Weblate
350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00: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
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
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +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
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
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
J. Ryan Stinnett
9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Michael Telatynski
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name
Show device ID in UserInfo when there is no device name
2021-05-10 16:19:56 +01:00
J. Ryan Stinnett
f41fc7e46c Upgrade cheerio and resolve type errors
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
2021-05-10 16:10:39 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
RiotRobot
1b372b17e0 Reset matrix-js-sdk back to develop branch 2021-05-10 15:23:03 +01:00
RiotRobot
82642f17fd Resetting package fields for development 2021-05-10 15:22:30 +01:00
RiotRobot
3e534b5d30 Merge branch 'master' into develop 2021-05-10 15:22:12 +01:00
J. Ryan Stinnett
03b3456c89
Merge pull request #6005 from matrix-org/jryans/sanitize-upgrade
Switch back to release version of `sanitize-html`
2021-05-10 15:15:47 +01:00
RiotRobot
f68013524c v3.20.0 2021-05-10 15:02:08 +01:00
RiotRobot
a1572e9ea3 Prepare changelog for v3.20.0 2021-05-10 15:02:07 +01:00
J. Ryan Stinnett
7f4c525d62 Switch back to release version of sanitize-html
The limit depth option has been available in a released version for a while now.
2021-05-10 14:57:35 +01:00
RiotRobot
a11c3a22c9 Upgrade matrix-js-sdk to 10.1.0 2021-05-10 14:55:31 +01:00
J. Ryan Stinnett
01a3c42d16
Merge pull request #5998 from matrix-org/dependabot/npm_and_yarn/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9
2021-05-10 14:50:50 +01:00
Michael Telatynski
3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
15035bd670
Merge pull request #6004 from matrix-org/jryans/image-metadata-release
[Release] Don't use the event's metadata to calc the scale of an image
2021-05-10 13:12:04 +01:00
Šimon Brandner
3b97e52246 Simplifie code a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:08:32 +01:00