e2ae6e6235
Separate sender profile into elements with classes
...
For separate CSS manipulation so that we can vary opacity independently for flair/name/aux
2017-09-19 16:56:14 +01:00
668e096194
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-09-19 16:36:51 +01:00
7414d4d1f9
Fix issue with "props.aux" being inserted instead of e.g. "sent an image"
2017-09-19 16:36:30 +01:00
d38e950f8b
Merge pull request #1400 from matrix-org/dbkr/flair_bluebird
...
Fix promise error in flair
2017-09-19 16:00:02 +01:00
80e0205b78
Fix promise error in flair
...
Import bluebird other wise it gets a native promise on my dev box
which does not have a finally method
2017-09-19 15:53:54 +01:00
b4ed9d7c87
Merge pull request #1351 from matrix-org/luke/feature-flair
...
Flair!
2017-09-19 15:05:40 +01:00
5295d7f058
Merge branch 'develop' into luke/feature-flair
2017-09-19 14:55:54 +01:00
a1e3115046
Merge pull request #1328 from matrix-org/dbkr/group_userlist
...
Group Membership UI
2017-09-19 14:54:08 +01:00
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
61a0f1ef67
Fix ugly integration button, use hover to show error
...
This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).
2017-09-19 11:57:23 +01:00
620ca5f211
v0.10.4-rc.1
2017-09-19 10:50:34 +01:00
fba66557b5
Prepare changelog for v0.10.4-rc.1
2017-09-19 10:50:33 +01:00
d992d6937e
js-sdk rc.1
2017-09-19 10:47:18 +01:00
658285ebbf
Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined
...
Fix RoomView stuck in 'accept invite' state
2017-09-19 10:34:39 +01:00
4d8eadad4f
Clarify comment
2017-09-19 10:21:20 +01:00
925cb2dccf
Do translation correctly
2017-09-18 17:44:13 +01:00
241d442284
Fail gracefully for non-supporting servers
2017-09-18 15:12:38 +01:00
6add06db44
Fix big with rejecting promises upon error
2017-09-18 15:11:49 +01:00
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +01:00
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
548e5f516c
Put flair into labs
2017-09-18 14:38:41 +01:00
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
caaf5cca14
Only show the integ management button if user is joined
2017-09-18 13:34:33 +01:00
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
678a6c56b4
Merge pull request #1268 from matrix-org/t3chguy/devtools
...
add /devtools command
2017-09-17 23:16:04 +01:00
b93f1746c0
Merge pull request #1359 from rponline/master
...
Fix broken Link
2017-09-17 23:06:06 +01:00
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
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
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
Luke Barnard