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

22686 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
c17c47d88b
Remove null check that was fixed in another PR 
See https://github.com/matrix-org/matrix-react-sdk/pull/4255
 2020-03-21 11:35:07 -06:00
Karol Kosek
4c08bd6bad Translated using Weblate (Polish) 
Currently translated at 60.6% (1348 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-03-21 17:35:06 +00:00
Nils J. Haugen
7520c75b41 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 48.3% (1074 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-03-21 17:35:05 +00:00
@a2sc:matrix.org
610daf5e6b Translated using Weblate (German) 
Currently translated at 75.5% (1679 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 17:35:05 +00:00
Tentarial
945f0d77f0 Translated using Weblate (German) 
Currently translated at 75.5% (1679 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 17:35:05 +00:00
Kévin C
f895eb5a08 Translated using Weblate (French) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-21 17:35:05 +00:00
Jeff Huang
e1c57c9748 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-21 17:35:04 +00:00
Michael Telatynski
4ab53607a0
Merge pull request #4255 from matrix-org/t3chguy/fix_local_jitsi 
Fix local jitsi build url fail and missing argument
 2020-03-21 17:34:55 +00:00
@a2sc:matrix.org
2b40fb4775 Translated using Weblate (German) 
Currently translated at 75.4% (1678 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:49 +00:00
Tentarial
b86deab837 Translated using Weblate (German) 
Currently translated at 75.4% (1678 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:49 +00:00
@a2sc:matrix.org
b1fc5b5cb3 Translated using Weblate (German) 
Currently translated at 75.4% (1677 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:33 +00:00
Tentarial
ed00da768b Translated using Weblate (German) 
Currently translated at 75.4% (1677 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:33 +00:00
@a2sc:matrix.org
c3e29ad56b Translated using Weblate (German) 
Currently translated at 75.4% (1676 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:16 +00:00
Tentarial
2a44767911 Translated using Weblate (German) 
Currently translated at 75.4% (1676 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:30:16 +00:00
@a2sc:matrix.org
f794372483 Translated using Weblate (German) 
Currently translated at 75.2% (1672 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:29:10 +00:00
Tentarial
8120b373be Translated using Weblate (German) 
Currently translated at 75.2% (1672 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:29:09 +00:00
@a2sc:matrix.org
bf7a79be6a Translated using Weblate (German) 
Currently translated at 75.0% (1668 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:28:06 +00:00
Tentarial
011e4c2bed Translated using Weblate (German) 
Currently translated at 75.0% (1668 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:28:06 +00:00
simon klemenc
a3c86ec5a8 Translated using Weblate (German) 
Currently translated at 75.0% (1667 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:27:34 +00:00
Tentarial
5ef0d4bef6 Translated using Weblate (German) 
Currently translated at 75.0% (1667 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:27:34 +00:00
simon klemenc
e0e07d6369 Translated using Weblate (German) 
Currently translated at 74.9% (1666 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:27:20 +00:00
Aaron Raimist
f57dc8e8ae Translated using Weblate (German) 
Currently translated at 74.9% (1666 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 15:27:20 +00:00
Michael Telatynski
506927ad8a change to defaults 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-21 10:49:55 +00:00
Michael Telatynski
ca02ff493c Fix local jitsi build url fail and missing argument 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-21 10:42:07 +00:00
Travis Ralston
94d23c815a Improve naming of Jitsi conferences 
Fixes https://github.com/vector-im/riot-web/issues/12812
 2020-03-20 14:19:47 -06:00
David Baker
ba1d245af9 Make SSSS migration toast dismissable 2020-03-20 19:01:26 +00:00
David Baker
252972e159 Dismiss SSSS migration toast once migration done 2020-03-20 18:53:31 +00:00
Weblate
754ee4e80f Merge branch 'origin/develop' into Weblate. 2020-03-20 16:26:32 +00:00
Michael Telatynski
0212e96938
Merge pull request #4244 from matrix-org/t3chguy/shortcuts3 
Add shortcut CmdOrCtrl+. to toggle right panel
 2020-03-20 16:26:26 +00:00
Michael Telatynski
a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/LoggedInView.js
 2020-03-20 16:10:27 +00:00
Weblate
7dc2ed9750 Merge branch 'origin/develop' into Weblate. 2020-03-20 16:09:53 +00:00
Michael Telatynski
06cc710fb0
Merge pull request #4241 from matrix-org/t3chguy/shortcuts1 
Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows
 2020-03-20 16:09:46 +00:00
Michael Telatynski
064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/RoomView.js
 2020-03-20 16:06:07 +00:00
Michael Telatynski
8a0ee2fd34 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 16:00:50 +00:00
Michael Telatynski
75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Weblate
1e09c08c48 Merge branch 'origin/develop' into Weblate. 2020-03-20 14:55:23 +00:00
Bruno Windels
c9de12ee74
Merge pull request #4240 from matrix-org/bwindels/bringbacklegacyverif 
Bring back legacy verification by comparing public device keys
 2020-03-20 14:55:17 +00:00
Bruno Windels
39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels
1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels
b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels
073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Bruno Windels
510b71b0e5 extract manual device verification out of device verify dialog 
as the plan is to remove the latter
 2020-03-20 15:36:58 +01:00
Damir Jelić
3185d6baf5 EventIndex: Add some logging to the file panel populating. 2020-03-20 13:58:29 +01:00
Bruno Windels
301b484371 ask request if method is supported rather than checking ourselves 2020-03-20 13:37:00 +01:00
Weblate
48a88fbb58 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:52:08 +00:00
Weblate
f8f095af82 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:51:22 +00:00
Damir Jelić
519c7f9ef0 Merge branch 'poljar/empty-search-error' into develop 2020-03-20 11:51:20 +01:00
Michael Telatynski
c176d1e070
Merge pull request #4247 from matrix-org/t3chguy/showHiddentEvents_spoof 
Break continuation on showHiddenEvents-rendered events
 2020-03-20 10:51:17 +00:00
Weblate
b45e05818e Merge branch 'origin/develop' into Weblate. 2020-03-20 10:50:34 +00:00
Michael Telatynski
624f88f0f1
Merge pull request #4246 from matrix-org/t3chguy/rr_margin 
Watch for show-RR settings changes, use room-specific and fix margins
 2020-03-20 10:50:29 +00:00