5618 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Barnard	4218308bef	Merge pull request #1200 from matrix-org/luke/fix-invite-sync-type-error ... Possibly fix accepting invites	2017-07-07 20:03:26 +01:00
Luke Barnard	62ee0f4e02	Fix accepting invites ... Accepting an invite would cause a room to arrive via /sync only for it to throw an error in the auto complete code and cause the client to go wibbly (infinite spinner or preview bar). The logs that lead to the debugging of this are https://github.com/matrix-org/riot-web-rageshakes/issues/239 Hopefully the error being throw isn't totally unrelated but looking at the sync handling for inviteRooms in sync.js, new rooms are stored and _then_ the Room event is emitted. The Room event could trigger setUserListFromRoom, which is where the bug was. So the room should have been stored regardless of this bug and the client should have been recoverable by swapping away and viewing the room again.	2017-07-07 19:43:30 +01:00
Kegan Dougal	f2d243443b	Suppress more errors from spurious postMessage calls on the demo instance	2017-07-07 17:44:25 +01:00
David Baker	0792c9a555	Merge pull request #1198 from matrix-org/luke/fix-rte-auto-complete-stuck ... Remove two possible sources for the "AutoComplete stays visible bug	2017-07-07 16:11:56 +01:00
Luke Barnard	7a8f524f4a	Remove two possible sources for the "AutoComplete stays visible bug ... which is now https://github.com/vector-im/riot-web/issues/4537 <- there. This does two things: - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.) - Make the "do we want to show the AutoComplete box?" logic a bit more sane	2017-07-07 15:30:31 +01:00
Richard Lewis	e970b68859	Merge pull request #1194 from matrix-org/rxl881/apps ... Use app ID for element key and pass screen parameter to scalar.	2017-07-07 11:28:39 +01:00
Richard Lewis	d1eab75cfc	Trigger rebuild	2017-07-07 11:15:13 +01:00
David Baker	28c0daf51d	Merge pull request #1148 from matrix-org/erikj/group_server ... Add group view page	2017-07-07 10:31:14 +01:00
David Baker	8df6deee23	Empty commit ... please re-test with updated riot-web branch	2017-07-07 10:23:20 +01:00
David Baker	1deb406294	Fix race	2017-07-07 10:12:06 +01:00
Luke Barnard	32a01b54b8	Merge branch 'develop' into erikj/group_server	2017-07-07 10:08:49 +01:00
Richard Lewis	0a1647e5c6	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps	2017-07-07 09:48:24 +01:00
Luke Barnard	7fdbec4046	Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2 ... Alter EMOJI_REGEX to include end of string ($)	2017-07-06 21:59:44 +01:00
Luke Barnard	0a4f8ffead	Alter EMOJI_REGEX to include end of string ($) ... Fixes https://github.com/vector-im/riot-web/issues/4529 because the match must include the remainder of the query.	2017-07-06 18:11:46 +01:00
David Baker	282b63d0cf	Merge pull request #1193 from matrix-org/luke/fix-create-room-preview ... Fix vector-im/riot-web#4526 by pretending to join when creating a room	2017-07-06 17:58:30 +01:00
Luke Barnard	a921059432	Fix vector-im/riot-web#4526 by pretending to join ... I thought about adding separate dispatches to prevent confusion but if anyone adds anything that listens to existing dispatches, they really ought to be grep-ing the world for said dispatch actions.	2017-07-06 17:40:27 +01:00
Richard Lewis	d091550ccb	Use app ID for element key and pass screen parameter to scalar.	2017-07-06 15:59:59 +01:00
Luke Barnard	6404f7603c	Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u ... Allow underline through MD and in RTE (MD) using <u> which works with CM	2017-07-06 14:08:01 +01:00
Luke Barnard	d9a67355d2	Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on ... Only insert HTML into the composer in RTE mode	2017-07-06 13:59:52 +01:00
Michael Telatynski	ff7ae5b995	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u	2017-07-06 13:56:20 +01:00
Luke Barnard	2aa5a3a09c	Merge pull request #1191 from matrix-org/t3chguy/room-settings-unban-no-pl ... only show unban button in RoomSettings if user has sufficient PL to do so	2017-07-06 13:54:52 +01:00
Michael Telatynski	fcd8321a63	Allow underline through MD and in RTE (MD) using <u> which works with CM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 13:49:13 +01:00
Michael Telatynski	6149b37245	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl	2017-07-06 13:30:40 +01:00
Michael Telatynski	c6d9ec42a2	only show unban button in RoomSettings if user has sufficient PL to do so ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 12:51:55 +01:00
Luke Barnard	bdefb35c64	Only insert HTML into the composer in RTE mode ... If MD mode is enabled, paste the plaintext equivalent.	2017-07-06 11:52:02 +01:00
Luke Barnard	3e93930dcc	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-07-06 11:18:10 +01:00
Luke Barnard	6b6af3f148	Remove RTE content_state logging	2017-07-06 11:17:54 +01:00
Richard van der Hoff	c29863362f	Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key ... Fix a React duplicate key error	2017-07-06 11:08:03 +01:00
Richard van der Hoff	4f8d9d869e	mention preserving ordering in comment	2017-07-06 10:47:15 +01:00
Kegan Dougal	42ba3ff410	Linting	2017-07-06 10:44:32 +01:00
Richard van der Hoff	6a2d6b2e6e	Fix a React duplicate key error ... If a single message contains the same link twice, we get an error from React about the clashing keys. De-dup the links to keep it quiet.	2017-07-06 10:02:25 +01:00
Kegsay	e0e321783b	Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182)	2017-07-06 09:28:48 +01:00
Luke Barnard	0bf1124f1b	Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist ... Implement MessageComposerStore to persist composer state when room switching	2017-07-05 18:24:27 +01:00
Luke Barnard	7f1d8e3c90	Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell ... Add visual feedback for when there are no completions available	2017-07-05 18:23:10 +01:00
Luke Barnard	14ddf4e2aa	Merge pull request #1187 from matrix-org/luke/fix-rte-emoji-filter-supported ... Filter out unsupported emoji from the emoji meta data	2017-07-05 18:21:50 +01:00
Luke Barnard	29e793f591	Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately ... When hitting "tab" use an autocompleteDelay of 0	2017-07-05 18:20:48 +01:00
Luke Barnard	89d0ec4de8	Merge pull request #1179 from matrix-org/luke/fix-query-matcher-empty-query ... Don't try to match with an empty query string	2017-07-05 18:20:25 +01:00
Luke Barnard	d78168d407	Add visual feedback for when there are no completions available ... Attempts to kep parity with old composer by using the same #faa colour but uses an animation instead of a js timeout. Fixes https://github.com/vector-im/riot-web/issues/4490	2017-07-05 18:14:22 +01:00
Luke Barnard	2de4dd7b71	Filter out unsupported emoji from the emoji meta data ... Because apparently emojione provides meta data for more than the emojis it supports itself. Fixes https://github.com/vector-im/riot-web/issues/4504	2017-07-05 17:09:16 +01:00
Richard van der Hoff	b52a6a693a	Merge pull request #1186 from matrix-org/rav/startup_logging ... Add some logging to track down flaky test	2017-07-05 16:29:03 +01:00
Richard van der Hoff	a20ed2f632	Add some logging to track down flaky test ... We had a test failure where apparently the MatrixClient failed to start ... let's try and figure out why.	2017-07-05 16:20:21 +01:00
Richard van der Hoff	769752e0b3	Merge pull request #1185 from matrix-org/rav/fix_reactsdk_build ... Run the riot-web tests against js-sdk develop	2017-07-05 15:58:05 +01:00
Richard van der Hoff	458e0a38bc	Run the riot-web tests against js-sdk develop ... When running the riot-web builds, use the develop version of js-sdk instead of the latest release, to improve our chances of compatibility.	2017-07-05 15:43:33 +01:00
Richard van der Hoff	b32cb174a9	Merge pull request #1184 from matrix-org/rav/chrome_headless ... Use Chrome instead of PhantomJS for tests	2017-07-05 15:20:08 +01:00
Luke Barnard	0eb979ab68	Merge pull request #1183 from matrix-org/luke/fix-new-dm ... Fix import for Rooms so that DMs can be created	2017-07-05 15:04:19 +01:00
Luke Barnard	b3db6344ae	Fix import for Rooms so that DMs can be created	2017-07-05 15:00:50 +01:00
Luke Barnard	5c9d3edec4	Revert #1170, fde7d5eaf4 ... There were a few issues with this, namely that links were no longer linkified and an error was logged to the console: `Warning: Stateless function components cannot be given refs (See ref "topic" in EmojiText created by RoomHeader). Attempts to access this ref will fail.`	2017-07-05 14:46:00 +01:00
Richard van der Hoff	f69033c907	Use headless chrome instead of phantomjs for tests	2017-07-05 14:39:02 +01:00
Richard van der Hoff	167ce88a80	Rewrite ScrollPanel test ... It turns out that Chrome now implements scroll-anchoring itself (ie, content stays in the same place when you add more stuff off-screen), which means we cannot rely on back-pagination to make ScrollPanel do a scroll. Instead, just do a scrollToToken. Which turns out to be considerably simpler anyway.	2017-07-05 14:34:25 +01:00
Luke Barnard	df23a6cd85	Use Object.assign to set initial state of MessageComposerStore ... Otherwise we just modify the initial state when running	2017-07-05 13:38:34 +01:00