5542 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Luke Barnard	b8dacd3bb1	Merge pull request #1165 from turt2live/travis/pad-12h ... Don't pad 12h timestamps	2017-07-03 16:43:23 +01:00
turt2live	45559f7cf0	AM/PM strings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-07-03 09:25:03 -06:00
David Baker	72eed70a84	Merge pull request #1173 from matrix-org/luke/fix-rte-forgets-me ... Strip out "/me" after committing to RTE history	2017-07-03 15:59:07 +01:00
David Baker	a7bb546b1f	Merge pull request #1172 from matrix-org/luke/fix-rte-md-format-without-selection ... When formatting with MD enabled, move selection inside ** or equivalent	2017-07-03 15:58:02 +01:00
Luke Barnard	775f5a0e5b	Strip out "/me" after committing to RTE history ... So that history can include emotes Fixes https://github.com/vector-im/riot-web/issues/4472	2017-07-03 15:47:03 +01:00
Luke Barnard	86889b8e8c	When formatting with MD enabled, move selection inside ** or equivalent ... Fixes https://github.com/vector-im/riot-web/issues/3225 Also insert `\n` after code-block and blockquote to fix https://github.com/vector-im/riot-web/issues/2746	2017-07-03 15:23:24 +01:00
David Baker	a89ea39dba	Merge pull request #1170 from matrix-org/t3chguy/emojione-room-topic ... make RoomHeader Topic use EmojiText to be emojione-friendly	2017-07-03 10:27:47 +01:00
Michael Telatynski	9ef83b8dc0	de-lint views/voip/* ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:58:46 +01:00
Michael Telatynski	661a0f3956	de-lint Resend, RoomListSorter, UserActivity ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:50:22 +01:00
Michael Telatynski	8bf13f8f48	de-lint email, extend ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:43:18 +01:00
Michael Telatynski	f514f1ff74	de-lint DateUtils ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:42:12 +01:00
Michael Telatynski	b937957609	de-lint createRoom ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:40:46 +01:00
Michael Telatynski	7da14d7078	de-lint ObjectUtils ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:38:32 +01:00
Michael Telatynski	68fb11d2bf	de-lint LifecycleStore ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:35:40 +01:00
Michael Telatynski	a270c85295	de-lint Entities ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:34:20 +01:00
Michael Telatynski	fdd8df87b0	de-lint PasswordReset ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:31:59 +01:00
Michael Telatynski	b98c105dcc	de-lint Skinner, RoomNotifs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:28:12 +01:00
Michael Telatynski	b8ad0957b2	de-lint AddThreepid ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:21:28 +01:00
Michael Telatynski	09ae6bba07	de-lint BasePlatform ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:15:26 +01:00
Michael Telatynski	e56203f2a1	de-lint RoomHeader, Avatar, SdkConfig, SlashCommands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:13:32 +01:00
Michael Telatynski	fde7d5eaf4	make RoomHeader Topic use EmojiText to be emojione-friendly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 13:36:28 +01:00
Michael Telatynski	fb61a5d68b	post-merge fix ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 13:08:23 +01:00
Michael Telatynski	09f017fdd2	Merge branches 'develop' and 't3chguy/add-missing-autocomplete-commands' of github.com:matrix-org/matrix-react-sdk into t3chguy/add-missing-autocomplete-commands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/autocomplete/CommandProvider.js # src/i18n/strings/en_EN.json	2017-07-01 13:07:18 +01:00
Michael Telatynski	9dba628f10	add missing commands to the Autocomplete CommandProvider ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 12:55:43 +01:00
Luke Barnard	0864ad9c8a	Merge pull request #1168 from matrix-org/luke/fix-rte-ascii-suggestions ... Match by emoji ascii regex first before shorthand	2017-06-30 16:54:36 +01:00
Luke Barnard	b315ed630e	Match by emoji ascii regex first before shorthand ... Plaintext emojis that start with ":" will also match against the shorthand regex but the match won't include the important part of the plaintext emoji. This means some emoji like ":)" won't be matched. To fix this, put the ascii emoji regex first so that the match will be plaintext or otherwise it will fall through to the shorthand match (if there is one). Fixes https://github.com/vector-im/riot-web/issues/4467	2017-06-30 16:31:40 +01:00
Travis Ralston	e058dd58e5	Fix overzealous code deletion ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-06-30 09:29:40 -06:00
Luke Barnard	0b46184a21	Merge pull request #1166 from matrix-org/luke/fix-rte-wrong-history-format ... Always store sent MD messages as MD in history	2017-06-30 16:05:45 +01:00
Luke Barnard	6bc40a112c	Always store sent MD messages as MD in history ... Because converting them to HTML when they got sent as HTML seems a bit pointless when they're just going to get transformed back again when retrieved from history. Fixes regression https://github.com/vector-im/riot-web/issues/4465	2017-06-30 15:47:48 +01:00
turt2live	01b7d7bb7c	Don't pad 12h timestamps ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-06-30 08:44:56 -06:00
Kegsay	11309f34e3	Reference count calls to start/stopListening on ScalarMessaging (#1164) ... Otherwise component mounting/unmounting can race and you end up with nothing listening.	2017-06-30 15:42:51 +01:00
Kegan Dougal	b8941f76d3	Fix bug which breaks the close button on scalar	2017-06-30 15:42:36 +01:00
Luke Barnard	1cfc2773ea	Merge pull request #1163 from matrix-org/luke/fix-rte-multi-line-up-down ... Only allow history selection when on the first or last line	2017-06-30 14:57:48 +01:00
Luke Barnard	15cfe5b8e4	Only allow history selection when on the first or last line ... (of a multi-line or otherwise message in the editor)	2017-06-30 14:27:26 +01:00
Luke Barnard	e1d461b23c	Merge pull request #1162 from matrix-org/luke/fix-rte-always-send-html ... Only send HTML when using RTE when necessary	2017-06-30 12:56:48 +01:00
Luke Barnard	030358e764	Clarify test names	2017-06-30 12:56:19 +01:00
Luke Barnard	80a73a50f5	Update tests ... When sending the letter "a" we expect it to be sent as a text message when RTE is enabled because we now detect that there is no formatting or styled blocks in the composer. We also expect emoji to be sent as plaintext if there is no formatting	2017-06-30 12:39:08 +01:00
Luke Barnard	e7a2c3b975	Only send HTML when using RTE when necessary ... When there are no styled blocks or inline styles applied within blocks, just send text instead of HTML. Also, don't add <br /> for the last <p> (the last block). Fixes https://github.com/vector-im/riot-web/issues/3147	2017-06-30 11:27:00 +01:00
Luke Barnard	25feee8507	Merge pull request #1161 from matrix-org/luke/fix-rte-move-selection-after-quote ... Move cursor to end of editor when quoting	2017-06-29 17:34:07 +01:00
Luke Barnard	8b8260c509	Move cursor to end of editor when quoting ... When quoting a message, move the selection to the end of the input box. Fixes https://github.com/vector-im/riot-web/issues/2336	2017-06-29 17:22:34 +01:00
Luke Barnard	a2d6918562	Merge pull request #1160 from matrix-org/luke/fix-rte-history-overwrite-current-message ... Fix #4422 by persisting the "currently composed" message	2017-06-29 17:16:58 +01:00
Luke Barnard	e5e7dec131	Fix #4422 by persisting the "currently composed" message ... This allows for browsing through history without losing the message currently being composed.	2017-06-29 17:02:19 +01:00