mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 22:11:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
24776 commits 219 branches 562 tags 474 MiB
Commit graph

24776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
1e21c043cf Merge branch 'origin/develop' into Weblate. 2020-05-26 13:26:09 +00:00
Stanislav Lukeš
c2ccac0d76 Translated using Weblate (Czech) 
Currently translated at 93.8% (2163 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-26 13:26:09 +00:00
Bruno Windels
f3ac96fa56
Merge pull request #4641 from matrix-org/bwindels/defaultfontsize 
Revert default font size to 15px
 2020-05-26 13:26:03 +00:00
Weblate
0cf2e2452e Merge branch 'origin/develop' into Weblate. 2020-05-26 13:22:27 +00:00
Bruno Windels
d45a597528
Merge pull request #4645 from matrix-org/bwindels/addloggingforfailtojoinroom 
Add logging when room join fails
 2020-05-26 13:22:22 +00:00
Bruno Windels
f1282179fb add logging when we fail to join a room 2020-05-26 14:58:09 +02:00
Weblate
076d3ab00f Merge branch 'origin/develop' into Weblate. 2020-05-26 12:55:07 +00:00
David Baker
e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00
Weblate
2f5eedd996 Merge branch 'origin/develop' into Weblate. 2020-05-26 12:48:53 +00:00
Michael Telatynski
b7428fcf35
Merge pull request #4618 from matrix-org/t3chguy/toasts3 
Migrate Toasts to Typescript and to granular priority system
 2020-05-26 13:48:47 +01:00
David Baker
d2fe4bcecd Unused imports 2020-05-26 13:46:47 +01:00
Weblate
9c56f30dae Merge branch 'origin/develop' into Weblate. 2020-05-26 12:45:44 +00:00
Michael Telatynski
0cec16d3b1
Merge pull request #4632 from matrix-org/t3chguy/confusing_copy 
Update Crypto Store Too New copy
 2020-05-26 13:45:40 +01:00
David Baker
563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +01:00
Weblate
4ebf5d66a7 Merge branch 'origin/develop' into Weblate. 2020-05-26 12:41:21 +00:00
MamasLT
6017481566 Translated using Weblate (Lithuanian) 
Currently translated at 64.4% (1495 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-26 12:41:21 +00:00
Michael Telatynski
d1084afb92
Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar 
MemberAvatar should not have its own letter fallback, it should use BaseAvatar
 2020-05-26 13:41:15 +01:00
David Baker
352727906e i18n 2020-05-26 13:40:36 +01:00
Michael Telatynski
c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
David Baker
7e45a71a8a Remove EncryptedEventDialog 
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
 2020-05-26 13:37:57 +01:00
Michael Telatynski
0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy 2020-05-26 13:35:18 +01:00
Michael Telatynski
f8d2124aa3 MemberAvatar should not have its own letter fallback, it should use BaseAvatar's 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:33:47 +01:00
Bruno Windels
cce53d8ab9 revert default font size to 15px 2020-05-26 14:11:36 +02:00
Weblate
6993e7d193 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:17:53 +00:00
Szimszon
1b8a7a33a4 Translated using Weblate (Hungarian) 
Currently translated at 99.2% (2304 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-26 11:17:52 +00:00
Michael Telatynski
29347d0c6a
Merge pull request #4630 from matrix-org/t3chguy/fix_upload_abort 
Fix media upload issues with abort and status bar
 2020-05-26 12:17:46 +01:00
Michael Telatynski
b27ab6663e
Merge branch 'develop' into t3chguy/fix_upload_abort 2020-05-26 12:04:36 +01:00
Weblate
7f3eafea99 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:03:57 +00:00
Michael Telatynski
a64de63f00
Merge pull request #4633 from matrix-org/t3chguy/group-view-guest 
fix viewGroup to actually show the group if possible
 2020-05-26 12:03:52 +01:00
Weblate
406c79d06d Merge branch 'origin/develop' into Weblate. 2020-05-26 11:02:31 +00:00
Michael Telatynski
8062e5a6e8
Merge pull request #4634 from matrix-org/t3chguy/passphrase-copy 
Update confirm passphrase copy
 2020-05-26 12:02:27 +01:00
Weblate
1fb6d41bf4 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:02:12 +00:00
Michael Telatynski
e049ead25f
Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y 
Improve accessibility of the emoji picker
 2020-05-26 12:02:07 +01:00
Weblate
04f251628f Merge branch 'origin/develop' into Weblate. 2020-05-26 11:00:56 +00:00
Michael Telatynski
1f4aac9544
Merge pull request #4631 from matrix-org/t3chguy/emoji-picker-footer-height 
Fix Emoji Picker footer being too small if text overflows
 2020-05-26 12:00:51 +01:00
Weblate
30dc76713a Merge branch 'origin/develop' into Weblate. 2020-05-26 11:00:06 +00:00
MamasLT
d7f8fdec52 Translated using Weblate (Lithuanian) 
Currently translated at 64.3% (1492 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-26 11:00:06 +00:00
Michael Telatynski
c00fd326c5
Merge pull request #4613 from matrix-org/t3chguy/toasts1 
Improve style of toasts to match Figma
 2020-05-26 11:59:58 +01:00
Michael Telatynski
1e9fc4ed8a
Merge pull request #4620 from matrix-org/t3chguy/toasts3_1 
Iterate toast count indicator more logically
 2020-05-26 11:59:27 +01:00
Weblate
b9dc466b26 Merge branch 'origin/develop' into Weblate. 2020-05-26 10:58:59 +00:00
Michael Telatynski
f4d69a9844
Merge pull request #4626 from matrix-org/t3chguy/redact_react 
Fix reacting to redactions
 2020-05-26 11:58:54 +01:00
Weblate
a8d9076dde Merge branch 'origin/develop' into Weblate. 2020-05-26 10:58:19 +00:00
Michael Telatynski
47af85b7b9
Merge pull request #4628 from matrix-org/t3chguy/message_sent 
Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
 2020-05-26 11:58:14 +01:00
Weblate
d3cdcc7f0f Merge branch 'origin/develop' into Weblate. 2020-05-26 09:04:18 +00:00
David Baker
7b646d5d39
Merge pull request #4640 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-05-26 10:04:11 +01:00
Weblate
803287f057 Merge branch 'origin/develop' into Weblate. 2020-05-26 08:37:04 +00:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias 
Replace `alias` with `address` in copy for consistency
 2020-05-26 09:36:58 +01:00
MamasLT
9f4691cb77 Translated using Weblate (Lithuanian) 
Currently translated at 64.3% (1494 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-26 08:36:48 +00:00
Weblate
94d3e4f045 Merge branch 'origin/develop' into Weblate. 2020-05-25 22:24:18 +00:00
Travis Ralston
3f2ab5a3a9
Merge pull request #4638 from matrix-org/travis/matrix-client-peg-ts 
Convert MatrixClientPeg to TypeScript
 2020-05-25 16:24:12 -06:00