24789 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	0fd5714e21	Merge pull request #4606 from matrix-org/t3chguy/peeking-races ... Fix room alias lookup vs peeking race condition	2020-05-27 17:07:12 +01:00
Jorik Schellekens	46134f5368	Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc ... Fix encryption icon miss-alignment	2020-05-27 17:05:32 +01:00
Jorik Schellekens	5c3208d942	Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression ... Fix sublist sizing regression	2020-05-27 17:04:49 +01:00
Jorik Schellekens	d534ca0e2b	Merge pull request #4650 from JorikSchellekens/joriks/fix-irc-codeblocks ... Fix lines overflowing room list width	2020-05-27 17:03:53 +01:00
David Baker	8bac26c5e3	Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog ... Remove the keyshare dialog	2020-05-27 10:24:33 +01:00
Travis Ralston	515304d32e	Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates ... Update badge counts in new room list as needed	2020-05-26 20:06:17 -06:00
Travis Ralston	8370fa8bb4	Event.decrypted from the client	2020-05-26 19:56:56 -06:00
Travis Ralston	bf8a3d4419	Bind to the room instead of the client ... Also add the other missing deregister handlers	2020-05-26 16:20:51 -06:00
Travis Ralston	a9c54153ee	Update badge counts in new room list as needed	2020-05-26 14:16:33 -06:00
poljar	6c10cbc903	EventIndex: Use a warning when redactions don't have an event id. ... Co-authored-by: Travis Ralston <travpc@gmail.com>	2020-05-26 21:48:10 +02:00
Damir Jelić	58f0814530	EventIndex: Handle invalid m.room.redaction events correctly. ... Clients might send invalid redaction events, such events will not have a valid redacts field containing the event id of the associated event that was redacted. Skip such events instead of ending up looping over the checkpoint forever.	2020-05-26 21:27:45 +02:00
Damir Jelić	403a64bcc6	EventIndex: Print out the checkpoint if there was an error during a crawl.	2020-05-26 20:48:22 +02:00
Jorik Schellekens	73213422a9	fix encryption icon missalignment	2020-05-26 18:15:06 +01:00
Jorik Schellekens	792859b939	Fix lines overflowing room list width	2020-05-26 17:39:39 +01:00
Jorik Schellekens	d8836f0f4b	Fir sublist sizing regression	2020-05-26 17:09:42 +01:00
David Baker	a496dafd41	Remove the keyshare dialog ... Fixes https://github.com/vector-im/riot-web/issues/11908	2020-05-26 16:51:20 +01:00
Jorik Schellekens	076a3e058d	Merge pull request #4635 from JorikSchellekens/joriks/field-ts ... Move Field to Typescript	2020-05-26 16:13:03 +01:00
Bruno Windels	3fc060c754	Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin ... Use connection error to detect network problem	2020-05-26 14:18:06 +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
Bruno Windels	cfe5173235	use connection error to detect network problem	2020-05-26 15:23:12 +02: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
David Baker	e5c4d6fdcd	Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog ... Remove EncryptedEventDialog	2020-05-26 13:55:02 +01: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
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
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
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
Jorik Schellekens	ba3fe850e0	Implement review ... - lint member order - cleaner type coersion - specify access modifiers everywhere	2020-05-26 12:09:23 +01:00
Michael Telatynski	b27ab6663e	Merge branch 'develop' into t3chguy/fix_upload_abort	2020-05-26 12:04:36 +01: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
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
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
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
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
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
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
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
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