PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
28550 commits 1 branch 0 tags 338 MiB
Commit graph

28550 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Michael Telatynski
16d8ea184d i18n 2020-09-15 15:58:23 +01:00
Weblate
dacdacd70d Merge branch 'origin/develop' into Weblate. 2020-09-15 14:55:15 +00:00
Travis Ralston
60c6e23b94 Match intended case for settings 2020-09-15 08:55:03 -06:00
Weblate
c80c0f31cf Merge branch 'origin/develop' into Weblate. 2020-09-15 14:53:53 +00:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00
Weblate
74f953cdd3 Merge branch 'origin/develop' into Weblate. 2020-09-15 14:52:25 +00:00
Travis Ralston
d11ce5fade
Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons 
Remove defunct "always show encryption icons" setting
 2020-09-15 08:52:19 -06:00
Michael Telatynski
6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Weblate
3aeefa98f4 Merge branch 'origin/develop' into Weblate. 2020-09-15 13:09:45 +00:00
LinAGKar
c605c3636b Translated using Weblate (Swedish) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-09-15 13:09:45 +00:00
Jeff Huang
0e3c478e38 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-09-15 13:09:45 +00:00
linsui
d643f908b1 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.5% (2316 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-09-15 13:09:44 +00:00
Michael Telatynski
9a3c30b1f1
Merge pull request #5203 from matrix-org/t3chguy/fix/15150 
Don't show Notifications Prompt Toast if user has master rule enabled
 2020-09-15 14:09:38 +01:00
Michael Telatynski
6b5426bddd Rename toolbar Notifier methods to prompt 2020-09-15 13:58:29 +01:00
Michael Telatynski
8e871c455c Fix german i18n test which was previously broken due to async 2020-09-15 13:24:20 +01:00
Michael Telatynski
608249745a Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
Michael Telatynski
5202037eeb Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT 2020-09-15 12:02:12 +01:00
Travis Ralston
0cac6874d4 Update i18n 2020-09-14 22:31:45 -06:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting 
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
 2020-09-14 22:03:54 -06:00
Travis Ralston
61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites 2020-09-14 11:50:08 -06:00
Weblate
9bf4891182 Merge branch 'origin/develop' into Weblate. 2020-09-14 16:09:51 +00:00
Michael Telatynski
ab91ce4b2d
Merge pull request #5206 from matrix-org/t3chguy/fix/15170 
Fix Bridges tab crashing when the room does not have bridges
 2020-09-14 17:09:46 +01:00
Weblate
6784321ba4 Merge branch 'origin/develop' into Weblate. 2020-09-14 15:10:00 +00:00
RiotRobot
747126950b Merge branch 'master' into develop 2020-09-14 16:07:54 +01:00
RiotRobot
4f930ac50c v3.4.1 2020-09-14 15:49:09 +01:00
RiotRobot
a5d42d1e2a Prepare changelog for v3.4.1 2020-09-14 15:49:09 +01:00
Michael Telatynski
e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
Weblate
cf3917d638 Merge branch 'origin/develop' into Weblate. 2020-09-14 14:38:16 +00:00
Michael Telatynski
e261a18183
Merge pull request #5202 from matrix-org/t3chguy/fix/15140 
Don't count widgets which no longer exist towards pinned count
 2020-09-14 15:38:10 +01:00
Weblate
3b44958323 Merge branch 'origin/develop' into Weblate. 2020-09-14 14:38:08 +00:00
random
9a3dfe5235 Translated using Weblate (Italian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-09-14 14:38:08 +00:00
Michael Telatynski
c6a3b8b783
Merge pull request #5205 from matrix-org/t3chguy/fix/resizeNotifier-optional 
Fix crashes with cannot read isResizing of undefined
 2020-09-14 15:38:02 +01:00
Michael Telatynski
e6e77633ad Fix crashes with cannot read isResizing of undefined 2020-09-14 15:37:02 +01:00
Michael Telatynski
ca0ad0b7ed Don't count widgets which no longer exist towards pinned count 2020-09-14 15:36:44 +01:00
Michael Telatynski
fa50b31fd2 Fix crashes with cannot read isResizing of undefined 2020-09-14 15:20:06 +01:00
Michael Telatynski
229967aa33 Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT 2020-09-14 15:16:29 +01:00
Michael Telatynski
493d3ae288 Don't show Notifications Prompt Toast if user has master rule enabled 2020-09-14 14:35:08 +01:00
Michael Telatynski
73608c4aa9 Don't count widgets which no longer exist towards pinned count 2020-09-14 14:03:51 +01:00
Weblate
baa6e396a0 Merge branch 'origin/develop' into Weblate. 2020-09-14 12:44:20 +00:00
Nikita Epifanov
f6a405ffd7 Translated using Weblate (Russian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-09-14 12:44:20 +00:00
Szimszon
475ea4aa2a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-09-14 12:44:19 +00:00
Michael Albert
2317300a59 Translated using Weblate (German) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-09-14 12:44:19 +00:00
Priit Jõerüüt
99811bfc74 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-14 12:44:18 +00:00
RiotRobot
148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot
c652ca56da Merge branch 'master' into develop 2020-09-14 13:41:29 +01:00
RiotRobot
099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot
c6eda819f0 Prepare changelog for v3.4.0 2020-09-14 13:36:31 +01:00