6a53b7b149
Merge pull request #1389 from turt2live/travis/ignored_users
...
Add ignore user API support
2017-09-17 22:05:02 +01:00
2605004edb
Update ignored users when js-sdk on UserSettings on change
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-17 15:04:03 -06:00
9e77d1b763
tweak comment
2017-09-17 21:50:24 +01:00
bc565ba925
Merge pull request #1392 from turt2live/travis/no_emoji
...
Add option to disable Emoji suggestions
2017-09-17 21:40:43 +01:00
9449813238
Merge pull request #1397 from matrix-org/t3chguy/i18n-1
...
sanitize the i18n for fn:textForHistoryVisibilityEvent
2017-09-17 21:39:56 +01:00
2d6bbafccd
remove unused strings since base branch
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:44:16 +01:00
e565882ba2
add missing comma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:40:18 +01:00
342e10214b
PL grew the missing string since my base branch so do for that too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:39:27 +01:00
63ccc45551
Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/nl.json
# src/i18n/strings/zh_Hans.json
2017-09-17 13:33:34 +01:00
bc4bb6cc48
remove redundant new line
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:29:05 +01:00
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:28:17 +01:00
5bf8c1e95f
Merge pull request #1394 from matrix-org/dbkr/emoji_more_fast_path
...
Don't check for only-emoji if there were none
2017-09-16 00:40:16 +01:00
13bfa5d59c
Merge pull request #1393 from matrix-org/dbkr/fix_symbol_emojification
...
Fix emojification of symbol characters
2017-09-16 00:38:44 +01:00
59ee401f9c
Force rebuild again with new riot-web branch
2017-09-15 15:59:01 +01:00
6e06b3a28b
empty commit to force travis retest
2017-09-15 15:38:01 +01:00
c265ec9571
Fix RoomView stuck in 'accept invite' state
...
After accepting a 3pid invite.
Rather than clear the joining flag when the join request completes,
leave it so the RoomView can see that we're expecting the user to
be joined in the various stages that might go through (waiting for
join request, waiting for room object, waiting for 'joined' member
event). The problem in this case was that we had to wait a bit for
the last one, and there was no bit of state to represent it.
This hopefully also makes the logic somewhat simpler.
Fixes https://github.com/vector-im/riot-web/issues/5041
2017-09-15 15:07:09 +01:00
fd1f9ac124
Merge pull request #1395 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-09-15 12:23:13 +01:00
bfedcd1ff0
Don't check for only-emoji if there were none
...
We were still running the emojione regex on all messages to
determine if they were *only* emoji (for the big emoji). This is
pointless on messages that we already know don't have emoji.
Also stop exporting unicodeToImage because it isn't used anywhere.
2017-09-15 12:03:32 +01:00
803e8f93e3
Fix emojification of symbol characters
...
Emojione has graphics for a lot of the symbol / dingbat characters
which are within the basic multilingual plane, but the new
fast-path regex was only detecthing surrogate pairs, so not
counting the symbols as emoji.
2017-09-15 11:43:55 +01:00
c24804ea38
Merge remote-tracking branch 'origin/develop' into develop
2017-09-15 08:56:06 +00:00
1b355e1a13
Merge pull request #1391 from matrix-org/dbkr/fix_slash_join
...
Make /join join again
2017-09-15 09:56:02 +01:00
5bce0ce277
Merge remote-tracking branch 'origin/develop' into develop
2017-09-15 08:18:59 +00:00
dd22b12e16
Translated using Weblate (Polish)
...
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-15 08:18:59 +00:00
c814f02f34
Merge pull request #1390 from matrix-org/dbkr/create_room_no_spinner
...
Display spinner not room preview after room create
2017-09-15 09:18:55 +01:00
b2de016b35
Add option to disable Emoji suggestions
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 21:28:12 -06:00
0363f73e28
Fix the MessagePanel test
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:57:28 -06:00
3c71898237
Add /(un)ignore to autocomplete
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:30:40 -06:00
6e00f70320
Hide read receipts and typing notifs for ignored users
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:25:51 -06:00
2e72d6cd7c
Hide events that were sent by ignored users
...
This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:16:56 -06:00
3889df6b08
Add (un)ignore button to MemberInfo
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
13a251e29c
Give feedback for /ignore and /unignore
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:21:36 -06:00
f3a4856593
Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join
2017-09-14 23:09:26 +01:00
2d517079d9
Add unresponsive /ignore and /unignore commands
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:51 -06:00
2bc866b997
Clean up UserSettings for linting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:20 -06:00
1f837d2ae1
Make /join join again
...
The auto_join parameter to view_room got broken at some point so
/join took you to the room and then sat there like a lemon.
Fixes https://github.com/vector-im/riot-web/issues/5029
2017-09-14 23:06:00 +01:00
4579d20fd0
Unignore people from the settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 15:33:36 -06:00
6b6e59e0dd
Display spinner not room preview after room create
...
After creating a room, display the activity spinner while we wait
for the room to come down the event stream.
This was the intention before but I can't see how it would have
worked: we were setting the 'joining' flag, but then resetting it
by claiming we were already joined in the view_room dispatch.
* Send 'joining' instead of 'joined' in view_room dispatch, which
will set the corresponding joining flag (ie. to indicate we've
sent a request to join the room). Remove the 'joined' flag.
* Reset 'joining' to false otherwise on a view_room dispatch to
prevent it from leaking between rooms (this may have been the
intention of the `if (payload.joined) newState.joining = false`?
Fixes https://github.com/vector-im/riot-web/issues/4701
2017-09-14 22:22:21 +01:00
4df16e8245
Display which users are ignored in the user settings
...
Adds https://github.com/vector-im/riot-web/issues/1767
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 12:51:53 -06:00
f612b1933b
start MELS expanded if it contains a highlighted/permalinked event.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-14 17:53:47 +01:00
8dc2604d63
Show who redacted an event on hover
...
This should fix #3931 although it's not obvious who actually performed the redaction.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 09:03:05 -06:00
c9d8005a4d
Translated using Weblate (Basque)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-09-14 10:23:17 +00:00
daabf06bdb
Merge remote-tracking branch 'origin/develop' into develop
2017-09-14 09:42:27 +00:00
94ec11d3e1
Merge pull request #1384 from matrix-org/dbkr/fix_oobdata
...
Fix the avatar / room name in room preview
2017-09-14 10:42:24 +01:00
5a2c74a893
Merge remote-tracking branch 'origin/develop' into develop
2017-09-14 09:38:30 +00:00
bb8538cd1a
Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button
...
Remove spurious cancel button
2017-09-14 10:38:26 +01:00
c890eea88a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 80.7% (690 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-09-14 08:02:23 +00:00
09fdd2bf0e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-09-14 05:11:57 +00:00
0f18528415
Merge remote-tracking branch 'origin/develop' into develop
2017-09-13 17:06:35 +00:00
b6c235b463
Translated using Weblate (Polish)
...
Currently translated at 100.0% (853 of 853 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-13 17:06:34 +00:00
db31033089
Merge pull request #1386 from matrix-org/dbkr/fix_email_dm
...
Fix starting a chat by email address
2017-09-13 18:06:31 +01:00
Matthew Hodgson