8566 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Telatynski	aeedf48d84	fix weird in op behaviour with null ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-11 11:45:13 +00:00
Michael Telatynski	7bf05b0715	add unmounted guard ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 16:01:19 +00:00
Michael Telatynski	25bc9cfbe7	make spinner size more appropriate ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 15:47:32 +00:00
Michael Telatynski	7425d01b21	tidy, improve error handling and improve Replies, run gen-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 15:45:42 +00:00
Michael Telatynski	23c0daa83a	pass onWidgetLoad to fix console err for e2e ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:41:31 +00:00
Michael Telatynski	fbb950e064	mass s/Quote/Reply ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:38:25 +00:00
Michael Telatynski	18145460b2	fix Replies for e2e ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:31:22 +00:00
Michael Telatynski	a15d024ad3	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-02-10 11:23:51 +00:00
Michael Telatynski	1c3d8cbe6e	initial refactor of Replies to use B explicit over-the-wire format ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 11:19:43 +00:00
David Baker	100a5ba96a	Merge branch 'master' into develop	2018-02-09 12:34:44 +00:00
David Baker	4bf5e44b20	v0.11.4	2018-02-09 12:34:00 +00:00
David Baker	e9e0d65401	Prepare changelog for v0.11.4	2018-02-09 12:33:59 +00:00
David Baker	3d174b0207	Merge branch 'release-v0.11.4' into develop	2018-02-09 12:24:36 +00:00
David Baker	3e4175f3e0	Add isUrlPermitted function	2018-02-09 12:20:05 +00:00
Luke Barnard	754b7fbad5	Merge pull request #1737 from matrix-org/rav/roomview_unmounted ... RoomView: guard against unmounting during peeking	2018-02-08 10:31:12 +00:00
Richard van der Hoff	5823b32ab1	RoomView: guard against unmounting during peeking ... it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.	2018-02-08 10:01:24 +00:00
David Baker	d51f6ceea2	Merge pull request #1736 from matrix-org/luke/fix-hs-is-urls-reset ... Fix HS/IS URL reset when switching to Registration	2018-02-07 16:09:43 +00:00
lukebarnard	45ad46b468	Fix HS/IS URL reset when switching to Registration	2018-02-07 15:58:29 +00:00
Luke Barnard	9da708335a	Merge pull request #1734 from matrix-org/dbkr/fix_call_buttons_canary_2 ... Fix the reject/accept call buttons in canary (mk2)	2018-02-07 12:04:34 +00:00
David Baker	8eb4137ec3	missing semicolon	2018-02-07 11:51:41 +00:00
David Baker	2a68e3ea39	import sdk	2018-02-07 11:42:50 +00:00
David Baker	383ef8b2ef	Merge pull request #1731 from matrix-org/dbkr/rate_limited_func_time_from_finish ... Make ratelimitedfunc time from the function's end	2018-02-07 10:16:36 +00:00
David Baker	0a5bf07913	Use getComponent	2018-02-07 10:13:19 +00:00
Luke Barnard	b4896dc108	Merge pull request #1735 from matrix-org/luke/dialog-matrix-context ... Give dialogs a matrixClient context	2018-02-07 09:54:31 +00:00
lukebarnard	c1649d1b75	Give dialogs a matrixClient context ... Dialogs are mounted outside of the main react tree of MatrixChat, so they won't have its child context.	2018-02-07 09:45:36 +00:00
David Baker	424c367ecc	Fix the reject/accept call buttons in canary (mk2) ... Fixes https://github.com/vector-im/riot-web/issues/6081 by making the accept/reject buttons AccessibleButtons which they should be anyway (presumably the role=button makes chrome do the right thing with the events). Also swallow the onClick event otherwise that propagates out to the room header and causes it to expand/collapse.	2018-02-06 18:45:43 +00:00
Luke Barnard	cf4ae681f4	Offline mode (#1723) ... * Allow the client to run without connection to HS (i.e. using indexeddb) Allows running without having pushRules (it's safe not to have these when running from indexeddb sync.) This means rooms will be displayed with "unknown" notifcation state. This assumes anything that uses the push rules will get pushRule state again when the client starts syncing again. For recovering from being disconnected, * If an avatar has fallen back, try again on reconnection * If a thumbnail image failed to load, retry on reconnect * Load joined groups when reconnecting Update tests to give MELS a context.matrixClient	2018-02-06 17:50:53 +00:00
Luke Barnard	9625180fbe	Merge pull request #1732 from matrix-org/dbkr/fix_addpresspicker_keys ... Fix key bindings in address picker dialog	2018-02-06 15:26:48 +00:00
David Baker	6162c0b360	Fix key bindings in address picker dialog ... Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674 Fixes https://github.com/vector-im/riot-web/issues/5994	2018-02-06 15:01:14 +00:00
David Baker	aab57d091d	Make ratelimitedfunc time from the function's end ... Otherwise any function tghat takes longer than the delay to execute will become eligible for execution again immediately after finishing and therefore be able to spin. This should help with https://github.com/vector-im/riot-web/issues/6060 (at least in the respect that it makes ratelimitedfunc do its job) even if it's not the reason Riot started getting wedged.	2018-02-06 14:39:13 +00:00
Luke Barnard	127eb61d36	Merge pull request #1730 from matrix-org/dbkr/display_name_change_message ... Fix display name change text	2018-02-06 10:37:59 +00:00
David Baker	3398c29aa5	Revert unintentional package.josn change	2018-02-06 10:31:37 +00:00
David Baker	f1eb899cad	Re-run i18n script & prune	2018-02-06 10:26:37 +00:00
David Baker	8458023bbc	Fix display name change message ... (i18n file fixes coming separately for ease of review) Fixes https://github.com/vector-im/riot-web/issues/5171	2018-02-06 10:24:38 +00:00
Luke Barnard	71aa4ee9e1	Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history ... Persist contentState when sending SlashCommand via MessageComposerInput	2018-02-06 09:14:36 +00:00
David Baker	d0972cdb1d	Merge remote-tracking branch 'origin/develop' into dbkr/newer-eslint-for-working-no-bind	2018-02-05 18:09:48 +00:00
Luke Barnard	70afce73a7	Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer ... This is actually MFileBody not MImageBody, change classname	2018-02-05 14:27:17 +00:00
David Baker	0d04c8dab5	Merge pull request #1717 from matrix-org/t3chguy/fix_3pid_dm_rooms ... Use invite_3pid prop of createRoom instead of manual invite after create	2018-02-05 12:07:43 +00:00
David Baker	ec3a37d9f3	Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard ... guard against m.room.aliases events with no keys (redaction?)	2018-02-05 10:21:05 +00:00
David Baker	3275a56013	Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites ... Fix not showing Invited section if all invites are 3PID	2018-02-05 10:14:23 +00:00
David Baker	916ab68506	Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image ... Fix Rich Replies on files	2018-02-05 09:58:37 +00:00
Michael Telatynski	d1a24ac87b	guard against m.room.aliases events with no keys (redaction?) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-02 08:12:56 +00:00
David Baker	e51dbd49f9	Merge pull request #1728 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk ... Update from Weblate.	2018-02-01 10:38:08 +00:00
David Baker	497cf21c86	Translated using Weblate (Hungarian) ... Currently translated at 100.0% (984 of 984 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/	2018-02-01 10:35:12 +00:00
Weblate	ee81d6aea1	Merge remote-tracking branch 'origin/develop' into develop	2018-01-31 18:10:59 +00:00
Nathan van Beelen	3a33eea5e9	Translated using Weblate (Dutch) ... Currently translated at 75.5% (743 of 984 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/	2018-01-31 18:10:57 +00:00
David Baker	4c17b5f1c7	Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard ... Null guard against falsey (non-null) props.node, to make react happy	2018-01-31 18:10:52 +00:00
Weblate	f193b3ae2c	Merge remote-tracking branch 'origin/develop' into develop	2018-01-30 15:21:19 +00:00
David Baker	cfd1f28258	Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync ... Use correct condition for getting account data after first sync	2018-01-30 15:21:12 +00:00
Michael Telatynski	8a6727ea98	This is actually MFileBody not MImageBody, change classname ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-30 10:55:23 +00:00