Commit graph

30455 commits

Author SHA1 Message Date
Michael Telatynski
d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
David Baker
4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00:00
Michael Telatynski
e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Michael Telatynski
9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston
f30d2ff1c5 Fix confetti room unread state check
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
2020-12-07 16:54:09 -07:00
Weblate
4ee261fc08 Merge branch 'origin/develop' into Weblate. 2020-12-07 22:37:39 +00:00
Travis Ralston
603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Weblate
23b29fdefb Merge branch 'origin/develop' into Weblate. 2020-12-07 22:13:59 +00:00
Travis Ralston
87dbc82a9f Merge branch 'feature_confetti#14676' into develop 2020-12-07 15:12:45 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Weblate
e64ca0e1ff Merge branch 'origin/develop' into Weblate. 2020-12-07 21:51:42 +00:00
Priit Jõerüüt
ad0ab079fd Translated using Weblate (Estonian)
Currently translated at 100.0% (2703 of 2703 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2020-12-07 21:51:42 +00:00
Kaede
cffeb940a5 Translated using Weblate (Japanese)
Currently translated at 50.3% (1362 of 2703 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2020-12-07 21:51:40 +00:00
Marcelo Filho
1da90ea5dc Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2703 of 2703 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2020-12-07 21:51:37 +00:00
Travis Ralston
f5ce50a472
Merge pull request #5391 from su-ex/fix-inverted-settings-default
Fix inverted settings default value
2020-12-07 14:51:28 -07:00
Weblate
93a34e7e96 Merge branch 'origin/develop' into Weblate. 2020-12-07 20:08:25 +00:00
random
d90e2db68c Translated using Weblate (Italian)
Currently translated at 97.6% (2639 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2020-12-07 20:08:25 +00:00
LinAGKar
47e31ab06f Translated using Weblate (Swedish)
Currently translated at 98.6% (2666 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2020-12-07 20:08:18 +00:00
Marcelo Filho
89d5d88ca4 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2020-12-07 20:08:16 +00:00
Michael Telatynski
14600adf66
Merge pull request #5474 from matrix-org/t3chguy/socials
Improve usability of the Server Picker Dialog
2020-12-07 20:08:04 +00:00
David Baker
b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker
365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker
8a58c9dea0 Update UI for two calls in the PiP view
and also merge hold_ui changes
2020-12-07 17:56:36 +00:00
David Baker
747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker
c7f1d97b1a Round off the sharp corners
Before you have someone's eye out
2020-12-07 15:38:55 +00:00
Weblate
2d54c7512f Merge branch 'origin/develop' into Weblate. 2020-12-07 14:35:37 +00:00
Michael Telatynski
52ada641ba
Merge pull request #5473 from schwukas/fixed-typos
Fix typos in some strings
2020-12-07 14:35:30 +00:00
Lukas
9bb04a857b Add generated i18n json 2020-12-07 15:21:31 +01:00
Weblate
80b85b6b84 Merge branch 'origin/develop' into Weblate. 2020-12-07 12:58:27 +00:00
J. Ryan Stinnett
07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:21 +00:00
Weblate
0fe5afa756 Merge branch 'origin/develop' into Weblate. 2020-12-07 12:33:28 +00:00
RiotRobot
7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
Weblate
ed075c7a6d Merge branch 'origin/develop' into Weblate. 2020-12-07 12:32:31 +00:00
RiotRobot
6360bc7a01 Merge branch 'master' into develop 2020-12-07 12:32:20 +00:00
RiotRobot
fefe84d101 v3.10.0 2020-12-07 12:31:08 +00:00
RiotRobot
ae835fb8a9 Prepare changelog for v3.10.0 2020-12-07 12:31:07 +00:00
RiotRobot
1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
Weblate
0747d49912 Merge branch 'origin/develop' into Weblate. 2020-12-07 10:19:12 +00:00
Priit Jõerüüt
51ededb94d Translated using Weblate (Estonian)
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2020-12-07 10:19:12 +00:00
XoseM
81c16555f6 Translated using Weblate (Galician)
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2020-12-07 10:19:10 +00:00
Tirifto
5178d335ec Translated using Weblate (Czech)
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2020-12-07 10:19:08 +00:00
waclaw66
fdeeb26cbe Translated using Weblate (Czech)
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2020-12-07 10:19:08 +00:00
Stanislav Lukeš
5cee82f9d5 Translated using Weblate (Czech)
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2020-12-07 10:19:08 +00:00
Kaede
c491ac6e29 Translated using Weblate (Japanese)
Currently translated at 50.0% (1352 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2020-12-07 10:19:01 +00:00
strix aluco
ed10693fed Translated using Weblate (Ukrainian)
Currently translated at 53.3% (1442 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2020-12-07 10:18:59 +00:00
Jeff Huang
df3fd6baa9 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2020-12-07 10:18:57 +00:00