Michael Telatynski
|
fdf63fd440
|
replace concat on comment from review
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:31:04 +01:00 |
|
Michael Telatynski
|
3ba9f560d4
|
get MatrixClient from context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:30:47 +01:00 |
|
Michael Telatynski
|
88f48914b4
|
improve comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:28:17 +01:00 |
|
Michael Telatynski
|
97fecaedc2
|
improve wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:26:42 +01:00 |
|
Michael Telatynski
|
d680d805ce
|
Merge branch 'develop' into t3chguy/m.relates_to
|
2018-04-23 10:14:48 +01:00 |
|
Aidan Gauland
|
6a918861bb
|
Add UI for displaying room avatars full size
Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar.
|
2018-04-21 15:47:31 +12:00 |
|
Michael Telatynski
|
941bb94234
|
fix reply fallback blunder
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-20 10:15:15 +01:00 |
|
Michael Telatynski
|
06408f843b
|
post BigMerge fixup - merge in stuff from riot-web PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-20 09:23:27 +01:00 |
|
Michael Telatynski
|
58cd585e86
|
start of BigMerge fixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-20 09:12:02 +01:00 |
|
Matthew Hodgson
|
d91c7f5e54
|
Add comment about enum hijinks
|
2018-04-17 16:53:11 +01:00 |
|
Matthew Hodgson
|
ce809e16d9
|
fix i18n thinko on createTrackedDialog
|
2018-04-17 16:51:17 +01:00 |
|
Matthew Hodgson
|
32dd7f976f
|
merge vector-im/riot-web#5881 into matrix-react-sdk
|
2018-04-16 00:04:04 +01:00 |
|
Matthew Hodgson
|
4da804fd64
|
Merge branch 'develop' into matthew/fix_layering
|
2018-04-15 23:59:09 +01:00 |
|
Matthew Hodgson
|
cb5ff404e1
|
fix missing i18n
|
2018-04-15 23:16:31 +01:00 |
|
Matthew Hodgson
|
610747e76a
|
fix paths and updateCheckStatusEnum
|
2018-04-13 16:49:59 +01:00 |
|
Michael Telatynski
|
a90bd6cd4f
|
Allow collapsing ReplyThread from MessageContextMenu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-13 12:28:58 +01:00 |
|
Michael Telatynski
|
8b1e411d6b
|
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
|
2018-04-13 10:54:09 +01:00 |
|
Matthew Hodgson
|
13765632e9
|
use new rageshake location
|
2018-04-13 01:36:41 +01:00 |
|
Matthew Hodgson
|
0336d99b9e
|
move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export
|
2018-04-13 01:29:38 +01:00 |
|
Matthew Hodgson
|
40a67ca8fe
|
point imports at the new locations
|
2018-04-13 00:43:44 +01:00 |
|
Michael Telatynski
|
c77807bd22
|
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/en_EN.json
# src/i18n/strings/eu.json
# src/i18n/strings/fr.json
# src/i18n/strings/lv.json
# src/i18n/strings/ru.json
# src/i18n/strings/zh_Hant.json
|
2018-04-12 09:48:06 +01:00 |
|
Matthew Hodgson
|
8ab8f76254
|
move non-Riot-specific components over from riot-web
|
2018-04-11 23:58:04 +01:00 |
|
Travis Ralston
|
fe2cbc584d
|
Merge branch 'develop' into travis/remove-presence
|
2018-04-11 15:17:28 -06:00 |
|
Luke Barnard
|
ab578a5c0c
|
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y
TopUnreadMessagesBar a11y
|
2018-04-11 15:47:43 +01:00 |
|
Luke Barnard
|
d877384d64
|
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave
Use correct 1-1 room avatar after users leave
|
2018-04-11 11:21:18 +01:00 |
|
Luke Barnard
|
edb754b76b
|
Use GeminiScrollbarWrapper in Flair settings of UserSettings
|
2018-04-10 18:08:19 +01:00 |
|
Matthew Hodgson
|
2d8880ec5f
|
patch NPE on Pill when lazyloading members
|
2018-04-09 23:02:15 +01:00 |
|
Michael Telatynski
|
f765db7d16
|
only clear reply_to_event if there was one to begin with
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-07 12:18:53 +01:00 |
|
Luke Barnard
|
01dd494f50
|
Make stickers/messages continuations of each other
|
2018-04-06 17:47:44 +01:00 |
|
Luke Barnard
|
008572afe1
|
Revert "Handle non-m.room.message event types."
This reverts commit f8d7ab10fa.
|
2018-04-06 16:42:59 +01:00 |
|
David Baker
|
28bf76b319
|
Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning
Fix warning "Unknown prop `wrappedRef` on <div> tag..."
|
2018-04-05 17:49:35 +01:00 |
|
Luke Barnard
|
e20f223e78
|
Fix warning "Unknown prop wrappedRef on <div> tag..."
GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
|
2018-04-05 17:39:25 +01:00 |
|
Richard Lewis
|
a41384a994
|
Fix function binding.
|
2018-04-04 23:45:47 +01:00 |
|
Richard Lewis
|
da6c2c51fb
|
Remove left and right menu padding
|
2018-04-04 13:38:48 +01:00 |
|
Michael Telatynski
|
9df2f7ddc8
|
Add warning to Upload Confirm prompt if replying, as can't reply with file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-04 11:19:13 +01:00 |
|
Michael Telatynski
|
1d90835de0
|
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/RoomView.js
|
2018-04-04 11:08:34 +01:00 |
|
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 |
|
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
|
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 |
|