c6fa8ea24c
show canonical aliases in timeline, and set/remove implicit ones
2018-09-20 01:07:01 +01:00
dc7212ec2b
switch back to simple TextForEvent
...
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
2018-09-17 18:20:12 +01:00
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
ab10b5493b
Support room creation events
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-20 16:20:59 +01:00
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen
...
Implement always-on-screen capability for widgets
2018-07-13 11:14:37 +01:00
5a5e967262
Fix avatars vanishing on hover
...
Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
2018-07-12 17:48:49 +01:00
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling
...
fix nullguard on EventTile, getComponent never returns falsey, it throws
2018-07-11 09:12:49 +01:00
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
a6cff4a969
Show server bans in the timeline
2018-07-06 11:06:31 +01:00
322b77b57f
don't throw, console.warn + dummy render instead
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 12:54:36 +01:00
55f4f1723d
fix nullguard on EventTile, getComponent never returns falsey, it throws
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 11:44:11 +01:00
f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop
...
don't fire share dialog when clicking timestamp of event,
2018-06-26 17:46:52 +01:00
67f803bc5f
don't fire share dialog when clicking timestamp of event,
...
it was tripping people up and broke search permalinks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 16:59:49 +01:00
aff2cc9065
EventTile:notif apply EmojiText to room name
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 01:21:42 +01:00
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
7d7a6f3d9c
ShareDialog share Message, link to timestamp and permalink in ctx menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:35:35 +01:00
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock
...
fix message appears unencrypted while encrypting and not_sent
2018-06-14 10:49:14 +01:00
5cc2361737
change not_sent e2e lock to match colour of text
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
d4b2f06a63
fix message appears unencrypted while in flight
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
846c14062a
show redacted stickers like other redacted messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
f0b7fd58b9
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:28:18 +01:00
f68036a4fb
Replies: un-break click-to-mention on SenderProfile for reply&preview
...
Fixes #6670
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:18:41 +01:00
71a12b6bbb
fix getDefaultProps mixup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:23:41 +01:00
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-05-02 13:08:38 +01:00
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:15:12 +01:00
e037cf0063
namespace CSS better and fix bug
2018-04-30 12:22:16 -04:00
55566b35a2
convert attribute to class
2018-04-28 12:39:25 -04:00
68dd57f56e
rename two methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
d42fa9d17a
Hide inline encryption icons except when hovering over a message
...
Closes https://github.com/vector-im/riot-web/issues/2882
This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988 )
I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
2018-04-22 22:30:37 -04:00
a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-13 12:28:58 +01:00
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
01dd494f50
Make stickers/messages continuations of each other
2018-04-06 17:47:44 +01:00
008572afe1
Revert "Handle non-m.room.message event types."
...
This reverts commit f8d7ab10fa
2018-04-06 16:42:59 +01:00
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
f8f8bc469e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-04-03 11:34:14 +01:00
b5ed08eba2
Merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-24 17:52:49 +00:00
b2d23b6999
Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.
2018-03-12 13:56:02 +00:00
3a3cced905
E2E "fudge-button"
...
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.
This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.
Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
2018-03-08 14:13:33 +00:00
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
90f9badbf3
s/Reply/ReplyThread/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:40:19 +00:00
cb293a852d
reply and reply_preview only differ in whether they contain <Reply />
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 21:07:25 +00:00
8062494692
show replies in ReplyPreview
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 20:58:39 +00:00
fbb950e064
mass s/Quote/Reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 12:38:25 +00:00
1c3d8cbe6e
initial refactor of Replies to use `B` explicit over-the-wire format
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 11:19:43 +00:00
56927b23e6
pass onWidgetLoad (which is required for SOME EventTileTypes)
...
XXX: they should follow an interface, this is somewhat nasty
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-28 22:14:22 +00:00
33995b053e
Add class to EventTile Line's that are quotes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:14 +00:00
f8d7ab10fa
Handle non-m.room.message event types.
2018-01-17 17:19:20 +00:00
b6f85fbf92
Don't treat sticker messages as info messages.
2018-01-17 16:52:10 +00:00
192cba2b79
allow text&onSenderProfileClick for tileShape===quote
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:25:43 +00:00
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
Matthew Hodgson