Commit graph

5558 commits

Author SHA1 Message Date
Michael Telatynski
9c2e3e25f0
clear reply_to_event at queue not send time
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:34:39 +01:00
Richard Lewis
06f1c504e7
Merge pull request #1672 from matrix-org/rxl881/snapshot
Bi-directional widget postMessaging API (stickerpacks) [WIP]
2018-04-03 18:37:03 +01:00
Luke Barnard
8ca1243ecb Add null-guard to prevent RoomAvatar NPE when room is null
which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
2018-04-03 17:35:34 +01:00
Richard Lewis
f8f8bc469e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-04-03 11:34:14 +01:00
Richard Lewis
b109c9304c Put stickers behind labs flag. 2018-04-02 22:24:46 +01:00
Richard Lewis
8241afe87d Fix content references 2018-04-02 20:25:24 +01:00
Richard Lewis
49bea1a35b Move stickerpicker content out of state in to generator function. 2018-04-02 10:56:45 +01:00
Richard Lewis
d83b6f1cf8 Use AccessibleButton. 2018-04-02 10:18:35 +01:00
Michael Telatynski
80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-03-31 17:46:31 +01:00
Peter Vágner
778ebe63ff TopUnreadMessagesBar: turn clickables into accessible buttons and fix
over verbosity for the accessible name.
2018-03-31 17:42:10 +02:00
Richard Lewis
557a45e890 Remove inline styling. 2018-03-29 22:22:57 +01:00
Richard Lewis
9cc3d3c9bb Move default sticker content into generator function. 2018-03-29 21:48:03 +01:00
Richard Lewis
ff0834ad9d Add comment. 2018-03-29 21:31:09 +01:00
Richard Lewis
003cf61388 Handle remove sticker picker errors. 2018-03-29 21:16:35 +01:00
Richard Lewis
2e6d6c83cd Add back in body 'ref' 2018-03-29 21:16:12 +01:00
Richard Lewis
6181ca642f "Stickerpack" translation. 2018-03-29 17:47:53 +01:00
Richard Lewis
c8f9586c9b Check for valid reference. 2018-03-29 17:35:21 +01:00
Luke Barnard
c9283ad988 Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable 2018-03-29 17:28:44 +01:00
Richard Lewis
67f755efcb Comment. 2018-03-29 17:26:54 +01:00
Richard Lewis
e21cc14e5b Comment. 2018-03-29 17:26:19 +01:00
Richard Lewis
38c8bc7d9a Consistent function naming. 2018-03-29 17:25:07 +01:00
Luke Barnard
2bc8d6d3a4 Use less confusing values on radio buttons 2018-03-29 17:25:06 +01:00
Richard Lewis
9c10d243e8 Add comment. 2018-03-29 17:09:03 +01:00
Richard Lewis
f383298267 Remove duplicate event handler. 2018-03-29 17:08:07 +01:00
Luke Barnard
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable 2018-03-29 17:01:19 +01:00
Richard Lewis
cafbd2904e Remove unused ref. 2018-03-29 16:57:21 +01:00
Luke Barnard
f42cdf6a4c Add radio button for setting group is_joinable
which dictates whether the group can be joined without invitation.
2018-03-29 16:57:07 +01:00
Richard Lewis
aefccb134c Ensure deleting is set to false. 2018-03-29 16:56:25 +01:00
Richard Lewis
35fcb2c9ab Catch rather than 'done' error handler. 2018-03-29 16:56:02 +01:00
Richard Lewis
23a52bdb4c Indentation. 2018-03-29 16:46:22 +01:00
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
Join this community button
2018-03-29 15:44:46 +01:00
Luke Barnard
c4322892de Reword group setting delay 2018-03-29 14:33:54 +01:00
Luke Barnard
385211528d Implement "Join this community" button
for groups that have truthy summary.profile.is_joinable.
2018-03-29 12:39:09 +01:00
Richard Lewis
4ac9653ab9 Refactor widget postMessage API. 2018-03-28 12:22:06 +01:00
Luke Barnard
00167fbc06 Init page change state in willMount 2018-03-28 11:25:28 +01:00
Luke Barnard
8d994f2788 Merge branch 'develop' into luke/track-page-change-duration 2018-03-28 10:56:36 +01:00
Luke Barnard
c8312dd5ae Use a less fragile API to track page change performance 2018-03-28 10:25:28 +01:00
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00:00
Luke Barnard
944940057e Remember that React needs React 2018-03-27 13:04:26 +01:00
Luke Barnard
2ffcad0981 Convert GeminiScrollbarWrapper to stateless component 2018-03-27 13:04:26 +01:00
Luke Barnard
39e9d52c04 Make sure to proxy special prop ref 2018-03-27 13:04:26 +01:00
Luke Barnard
b80568b1c5 Wrap GeminiScrollbar in a component, enabled forceGemini
Fixes https://github.com/vector-im/riot-web/issues/6294
2018-03-27 13:04:26 +01:00
Luke Barnard
69d9080dd5 Track duration of page changes
The duration measured is between
 - componentWillUpdate of MatrixChat and
 - componentDidUpdate of MatrixChat.

This does not account for *all* changes to the view that occur
when a room switch happens, for example. But it does at least
capture the difference between switching to a "big" room and
switching to a small test room.
2018-03-27 11:17:49 +01:00
David Baker
0a920ae801
Indenting fix 2018-03-26 13:33:47 +01:00
Michael Telatynski
b5ed08eba2
Merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-24 17:52:49 +00:00
Aidan Gauland
3d4feac75b Don't try to show unset display name
In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
2018-03-23 17:18:44 +13:00
Aidan Gauland
7e1913ef3c Merge branch 'develop' into show-display-name-in-receipts 2018-03-23 15:51:10 +13:00
David Baker
e06783c5c7 Fix PresenceLabel in MemberInfo
Which crashing when clicking on a member if presence was still
enabled.
2018-03-21 12:45:09 +00:00
Luke Barnard
856c499541 Fix room tile badge not disappearing when receiving a read receipt
Fixes https://github.com/vector-im/riot-web/issues/6357
2018-03-20 17:19:49 +00:00
Luke Barnard
eb52487b6d
Merge pull request #1806 from matrix-org/dbkr/lets_kill_presence
Option to remove the presence feature by HS
2018-03-20 13:01:18 +00:00