David Baker
4d8eadad4f
Clarify comment
2017-09-19 10:21:20 +01:00
Luke Barnard
925cb2dccf
Do translation correctly
2017-09-18 17:44:13 +01:00
Luke Barnard
241d442284
Fail gracefully for non-supporting servers
2017-09-18 15:12:38 +01:00
Luke Barnard
6add06db44
Fix big with rejecting promises upon error
2017-09-18 15:11:49 +01:00
Luke Barnard
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +01:00
Luke Barnard
3476cfca79
getPublicGroups->getPublicisedGroups
...
To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542
2017-09-18 14:44:35 +01:00
Luke Barnard
548e5f516c
Put flair into labs
2017-09-18 14:38:41 +01:00
David Baker
0958689d25
Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button
...
Only show the integ management button if user is joined
2017-09-18 13:42:11 +01:00
Luke Barnard
caaf5cca14
Only show the integ management button if user is joined
2017-09-18 13:34:33 +01:00
Matthew Hodgson
09e6ea00c5
Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget
...
suppressOnHover for member entity tiles which have no onClick
2017-09-17 23:19:35 +01:00
Matthew Hodgson
678a6c56b4
Merge pull request #1268 from matrix-org/t3chguy/devtools
...
add /devtools command
2017-09-17 23:16:04 +01:00
Matthew Hodgson
b93f1746c0
Merge pull request #1359 from rponline/master
...
Fix broken Link
2017-09-17 23:06:06 +01:00
Matthew Hodgson
141ae916ce
Merge pull request #1387 from turt2live/travis/tooltip_redacter
...
Show who redacted an event on hover
2017-09-17 22:36:18 +01:00
Matthew Hodgson
b06d540f4c
Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded
...
start MELS expanded if it contains a highlighted/permalinked event.
2017-09-17 22:09:44 +01:00
Matthew Hodgson
6a53b7b149
Merge pull request #1389 from turt2live/travis/ignored_users
...
Add ignore user API support
2017-09-17 22:05:02 +01:00
Travis Ralston
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
Matthew Hodgson
9e77d1b763
tweak comment
2017-09-17 21:50:24 +01:00
Matthew Hodgson
bc565ba925
Merge pull request #1392 from turt2live/travis/no_emoji
...
Add option to disable Emoji suggestions
2017-09-17 21:40:43 +01:00
Matthew Hodgson
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
Michael Telatynski
2d6bbafccd
remove unused strings since base branch
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:44:16 +01:00
Michael Telatynski
e565882ba2
add missing comma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:40:18 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
bc4bb6cc48
remove redundant new line
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:29:05 +01:00
Michael Telatynski
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:28:17 +01:00
Matthew Hodgson
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
Matthew Hodgson
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
David Baker
59ee401f9c
Force rebuild again with new riot-web branch
2017-09-15 15:59:01 +01:00
David Baker
6e06b3a28b
empty commit to force travis retest
2017-09-15 15:38:01 +01:00
David Baker
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
David Baker
fd1f9ac124
Merge pull request #1395 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-09-15 12:23:13 +01:00
David Baker
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
David Baker
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
Weblate
c24804ea38
Merge remote-tracking branch 'origin/develop' into develop
2017-09-15 08:56:06 +00:00
David Baker
1b355e1a13
Merge pull request #1391 from matrix-org/dbkr/fix_slash_join
...
Make /join join again
2017-09-15 09:56:02 +01:00
Weblate
5bce0ce277
Merge remote-tracking branch 'origin/develop' into develop
2017-09-15 08:18:59 +00:00
Akcja Demokracja Open-Source
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
David Baker
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
turt2live
b2de016b35
Add option to disable Emoji suggestions
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 21:28:12 -06:00
turt2live
0363f73e28
Fix the MessagePanel test
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:57:28 -06:00
turt2live
3c71898237
Add /(un)ignore to autocomplete
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:30:40 -06:00
turt2live
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
turt2live
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
Travis Ralston
3889df6b08
Add (un)ignore button to MemberInfo
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
Travis Ralston
13a251e29c
Give feedback for /ignore and /unignore
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:21:36 -06:00
David Baker
f3a4856593
Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join
2017-09-14 23:09:26 +01:00
Travis Ralston
2d517079d9
Add unresponsive /ignore and /unignore commands
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:51 -06:00
Travis Ralston
2bc866b997
Clean up UserSettings for linting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 16:08:20 -06:00
David Baker
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
Travis Ralston
4579d20fd0
Unignore people from the settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 15:33:36 -06:00