5970 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Luke Barnard	3d5b3ed7ad	Use ContentState instead and persist over localStorage	2017-07-05 11:49:34 +01:00
David Baker	3b06db0725	Pass with, height & resizeMethod through ... Was spelt wrong anyway	2017-07-05 11:39:22 +01:00
Luke Barnard	084a933dbd	Implement MessageComposerStore to persist composer state across room switching ... This behaviour was present in the old composer but implemented using local storage. This is unecessary as we don't really care about our drafts across clients, the important thing is that our draft is kept when switching rooms. As a bonus, ifnore vertical arrow key presses when a modifier key is pressed so that the room switching keys (alt + up/down arrow) don't also cause history browsing (or autocomplete browsing).	2017-07-05 10:24:55 +01:00
Luke Barnard	5f6c3e5afc	When hitting "tab" use an autocompleteDelay of 0 ... So that there's no delay when tab completing. Fixes https://github.com/vector-im/riot-web/issues/4497	2017-07-04 17:49:50 +01:00
Luke Barnard	710ee69418	Don't try to match with an empty query string ... This was causing UserProvider to give results because every string happens to start with empty string and its regex also acepts the empty string.	2017-07-04 17:32:07 +01:00
Luke Barnard	0af77e8913	Merge pull request #1177 from matrix-org/luke/fix-rte-prefix-matching ... Only match users by matchgin displayname or user ID prefixes	2017-07-04 17:09:39 +01:00
Luke Barnard	5c10e352bb	Merge pull request #1178 from matrix-org/luke/fix-rte-truncate ... Only truncate autocomplete pulls of Emoji, Room and UserProvider	2017-07-04 17:08:39 +01:00
Luke Barnard	2861adc830	Only truncate autocomplete pulls of Emoji, Room and UserProvider ... Leaving Commands and DuckDuckGo not truncated	2017-07-04 16:50:50 +01:00
Luke Barnard	6a80875c01	Only match users by matchgin displayname or user ID prefixes ... Because tab completing "k" probably shouldn't give you "luke" Fixes https://github.com/vector-im/riot-web/issues/4495	2017-07-04 16:29:06 +01:00
Luke Barnard	77348e6201	Remove spurious, unused code	2017-07-04 15:20:00 +01:00
Luke Barnard	e6ec5742be	_t should be used on string literals ... For scripts to easily find translations	2017-07-04 15:06:24 +01:00
Luke Barnard	e3f2eb5232	Take RTE out of labs! 🎉 ... This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently. This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.	2017-07-04 14:44:55 +01:00
Luke Barnard	2e95f5871c	Merge pull request #1175 from matrix-org/luke/fix-rte-autocomplete-sorting ... Improve the sorting applied to the sorting of autocomplete results	2017-07-04 14:20:42 +01:00
Luke Barnard	e688eca823	Improve the sorting applied to the sorting of autocomplete results ... QueryMatcher: sort results based on the position of the query within the matching value. The closer to the beginning of the word, the higher the result apears. UserProvider: perf improvement (slice early) and refactor onUserSpoke	2017-07-04 13:53:06 +01:00
Richard van der Hoff	fb86534ba3	Merge pull request #1171 from matrix-org/t3chguy/delintify ... De-Lint 23 files	2017-07-04 10:40:49 +01:00
Luke Barnard	c84d707124	Merge pull request #1169 from matrix-org/t3chguy/add-missing-autocomplete-commands ... add missing commands to the Autocomplete CommandProvider	2017-07-04 10:32:29 +01:00
Luke Barnard	d130411f6b	Merge pull request #1174 from matrix-org/luke/fix-rte-edge-detection ... Only move through history if caret at start or end of line	2017-07-04 10:32:04 +01:00
Luke Barnard	664f3acc3c	Only move through history if caret at start or end of line ... As suggested by @dbkr (because this is what we do for the old composer), only move through history when the caret is that the beginning of the first line (block) or end of the last. This has the nice property of being able to move the caret up to a really long message: fixes https://github.com/vector-im/riot-web/issues/4471	2017-07-04 10:12:06 +01:00
Michael Telatynski	fc379e2a15	fix typos post-luke-review ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-03 19:24:18 +01:00
Michael Telatynski	34c9bbfd86	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/rooms/RoomHeader.js	2017-07-03 19:15:38 +01:00
Michael Telatynski	827c38d4a5	fix variable clash ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-03 19:13:07 +01:00