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
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
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
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
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
b3db6344ae
Fix import for Rooms so that DMs can be created
2017-07-05 15:00:50 +01:00
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
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
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
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
2861adc830
Only truncate autocomplete pulls of Emoji, Room and UserProvider
...
Leaving Commands and DuckDuckGo not truncated
2017-07-04 16:50:50 +01:00
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
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
fb86534ba3
Merge pull request #1171 from matrix-org/t3chguy/delintify
...
De-Lint 23 files
2017-07-04 10:40:49 +01:00
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
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
fc379e2a15
fix typos post-luke-review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-03 19:24:18 +01:00
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
827c38d4a5
fix variable clash
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-03 19:13:07 +01:00
b8dacd3bb1
Merge pull request #1165 from turt2live/travis/pad-12h
...
Don't pad 12h timestamps
2017-07-03 16:43:23 +01:00
45559f7cf0
AM/PM strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-07-03 09:25:03 -06:00
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
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
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
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
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
9ef83b8dc0
de-lint views/voip/*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:58:46 +01:00
661a0f3956
de-lint Resend, RoomListSorter, UserActivity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:50:22 +01:00
8bf13f8f48
de-lint email, extend
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:43:18 +01:00
f514f1ff74
de-lint DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:42:12 +01:00
b937957609
de-lint createRoom
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:40:46 +01:00
7da14d7078
de-lint ObjectUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:38:32 +01:00
68fb11d2bf
de-lint LifecycleStore
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:35:40 +01:00
a270c85295
de-lint Entities
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:34:20 +01:00
fdd8df87b0
de-lint PasswordReset
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:31:59 +01:00
b98c105dcc
de-lint Skinner, RoomNotifs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:28:12 +01:00
b8ad0957b2
de-lint AddThreepid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:21:28 +01:00
09ae6bba07
de-lint BasePlatform
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:15:26 +01:00
e56203f2a1
de-lint RoomHeader, Avatar, SdkConfig, SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 14:13:32 +01:00
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
fb61a5d68b
post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 13:08:23 +01:00
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
9dba628f10
add missing commands to the Autocomplete CommandProvider
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-01 12:55:43 +01:00
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
e058dd58e5
Fix overzealous code deletion
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-06-30 09:29:40 -06:00
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
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
01b7d7bb7c
Don't pad 12h timestamps
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-06-30 08:44:56 -06:00
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
b8941f76d3
Fix bug which breaks the close button on scalar
2017-06-30 15:42:36 +01:00
Luke Barnard