PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
12126 commits 1 branch 0 tags 338 MiB
Commit graph

2084 commits

Author SHA1 Message Date
David Baker
8b64ddcbe8 Do some level of local echo for widgets 
* Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
 2018-07-03 11:16:44 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:28 +01:00
Michael Telatynski
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute 2018-06-29 19:17:43 +01:00
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 19:16:56 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist 
fix historical section
 2018-06-26 18:26:29 +01:00
David Baker
fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize 
Fix RoomSubList headers by re-commiting 1faecfd
 2018-06-26 18:23:38 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker
6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker
0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
Michael Telatynski
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
 2018-06-26 07:51:16 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent 
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:33 +01:00
Luke Barnard
e292ee942f Fix RoomSubList headers by re-commiting 1faecfd 
The original got reverted in ebfafb36 somehow.
 2018-06-25 16:37:45 +01:00
Luke Barnard
a24cb8e678
Merge pull request #2008 from matrix-org/t3chguy/focus_composer 
fix instances of composer not getting/regaining focus
 2018-06-25 10:22:29 +01:00
Luke Barnard
383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 
notif panel fixes
 2018-06-25 09:53:24 +01:00
Michael Telatynski
e1ba6949d0
expand composer input focus region and apply cursor:text to it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:53 +01:00
Michael Telatynski
aff2cc9065
EventTile:notif apply EmojiText to room name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:21:42 +01:00
David Baker
6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +01:00
David Baker
a6d9c25b70
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands 
refactor, consolidate and improve SlashCommands
 2018-06-20 13:56:29 +01:00
David Baker
e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski
85ddc0651b
consolidate the two locations commands are defined, as it was a MESS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 19:34:40 +01:00
Luke Barnard
bea52eccf8 Remove unused import, constant 2018-06-18 17:40:48 +01:00
Michael Telatynski
e0d36b18c9
make RoomTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:08:47 +01:00
Michael Telatynski
1a236499b1
fix import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 11:54:06 +01:00
Michael Telatynski
4fdb64a049
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:10:13 +01:00
Michael Telatynski
8fa96e19d5
allow rightclicking for exposing room tile context menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:07:16 +01:00
Michael Telatynski
df15841483
split too long line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:28:23 +01:00
Michael Telatynski
b97aa77aca
factor out warn self demote and apply to muting yourself 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:27:23 +01:00
David Baker
8cf17a66e5 Very basic Jitsi integration 
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
 2018-06-15 15:12:32 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group 
Share Dialog
 2018-06-15 10:52:27 +01:00
Luke Barnard
e81edd958b
Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu 
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
 2018-06-14 17:32:24 +01:00
Michael Telatynski
3b141d7a84
change variable names for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 16:48:00 +01:00
Michael Telatynski
1346f47a12
allow filtering Group Invite Tiles with the same search filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 14:18:39 +01:00
Michael Telatynski
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
David Baker
666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
David Baker
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
David Baker
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception 
Fix exception when opening dev tools
 2018-06-14 09:45:19 +01:00
David Baker
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker 
show redacted stickers like other redacted messages
 2018-06-13 17:28:22 +01:00
David Baker
b81e12e4cc Fix exception when opening dev tools 
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.

This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.

Fixes https://github.com/vector-im/riot-web/issues/6436
 2018-06-13 16:55:16 +01:00
Michael Telatynski
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
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 13:51:04 +01:00
Michael Telatynski
846c14062a
show redacted stickers like other redacted messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 09:28:35 +01:00
Michael Telatynski
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:35:06 +01:00
Michael Telatynski
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:23:11 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics 
Pinned message cosmetic improvements
 2018-06-08 16:46:33 +01:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins 
Update pinned messages in real time
 2018-05-27 17:50:23 +01:00
Travis Ralston
929da30df8 onEvent -> onStateEvent 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 10:28:47 -06:00
Travis Ralston
ec53b5f5ab Expose at-room power level setting 
Fixes https://github.com/vector-im/riot-web/issues/5835

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 21:22:42 -06:00
Travis Ralston
53396ff38d Show timestamp of pinned messages on hover 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:46:11 -06:00
Travis Ralston
085271a864 Update pinned messages in real time 
Fixes https://github.com/vector-im/riot-web/issues/5358

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:18:35 -06:00
Travis Ralston
033c41a2a8 Align pinned message contents and reduce image size 
Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:40:48 -06:00
Travis Ralston
62f4cfe734 Don't affect avatars in pinned message contents 
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:21:24 -06:00
Matthew Hodgson
6299e188a4 unbreak keyboard shortcuts & ctrl-backspace 2018-05-26 02:11:20 +01:00
Matthew Hodgson
ab41212258 fix double-nested code blocks & bump md-serializer 2018-05-26 00:37:21 +01:00
Matthew Hodgson
3bf28a08ec experiments in dharma 2018-05-25 03:17:29 +01:00
Matthew Hodgson
cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Matthew Hodgson
864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Matthew Hodgson
b0ff61f7ef switch code schema to match slate-md-serializer 2018-05-23 14:12:08 +01:00
Matthew Hodgson
fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Matthew Hodgson
6fba8311f9 escape blockquotes correctly 
and fix NPE
 2018-05-23 02:09:37 +01:00
Matthew Hodgson
794a60b9f8 refocus editor immediately after executing commands 
and persist selections correctly across blur/focus
 2018-05-23 01:36:21 +01:00
Matthew Hodgson
e7a4ffaf45 fix emojioneifying autoconverted emoji 2018-05-23 00:52:00 +01:00
Matthew Hodgson
cace5e8bfc fix bug where selection breaks after inserting emoji 2018-05-23 00:41:46 +01:00
Luke Barnard
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users 
improve privileged section users in room settings
 2018-05-22 16:07:01 +01:00
Matthew Hodgson
11cea61661 refocus editor after clicking on autocompletes 2018-05-21 12:28:08 +01:00
Matthew Hodgson
7de45f8b7b make quoting work 2018-05-21 03:48:59 +01:00
Matthew Hodgson
b616fd025e comment out all the tests for now 2018-05-20 23:34:06 +01:00
Matthew Hodgson
e460cf35e0 hide formatting bar for MD editor 2018-05-20 22:48:40 +01:00
Matthew Hodgson
f981d7b729 unify buttons on the node type names, and make them work 2018-05-20 22:39:40 +01:00
Matthew Hodgson
d799b7e424 refactor roundtripping into a single place 
and fix isRichTextEnabled to be correctly camelCased everywhere...
 2018-05-20 16:30:39 +01:00
Matthew Hodgson
aac6866779 switch back to using commonmark for serialising MD when roundtripping 
and escape MD correctly when serialising via slate-md-serializer
 2018-05-20 14:33:14 +01:00
Matthew Hodgson
e9cabf0e85 add pill and emoji serialisation to Md 2018-05-20 03:17:51 +01:00
Matthew Hodgson
a0d88a829d support sending inlines from the RTE. 
includes a horrific hack for sending emoji until
https://github.com/ianstormtaylor/slate/pull/1854 is merged
or otherwise solved
 2018-05-20 02:53:32 +01:00
Matthew Hodgson
d76a2aba9b use <p/> as our root node everywhere and fix blank roundtrip bug 2018-05-20 01:07:25 +01:00
Matthew Hodgson
c3a6a41e5d support links in RTE 2018-05-20 00:49:29 +01:00
Matthew Hodgson
f2116943c8 switch schema to match the MD serializer 2018-05-20 00:17:11 +01:00
Matthew Hodgson
65f0b05719 fix typo 2018-05-19 23:40:22 +01:00
Matthew Hodgson
572a31334f add h4, h5 and h6 2018-05-19 23:34:30 +01:00
Matthew Hodgson
1f05aea884 make HTML pasting work 2018-05-19 23:33:07 +01:00
Matthew Hodgson
1536ab433a make file pasting work again 2018-05-19 22:05:31 +01:00
Matthew Hodgson
d426c3474f fix strikethough & code, improve shift-return & backspace 2018-05-19 21:36:22 +01:00
Matthew Hodgson
58670cc3e5 exit list more sanely on backspace 2018-05-19 21:14:39 +01:00
Matthew Hodgson
a4d9338cf0 let backspace delete list nodes in RTE 2018-05-19 20:38:07 +01:00
Matthew Hodgson
167742d900 make RTE sending work 2018-05-19 20:28:38 +01:00
Matthew Hodgson
089ac337f4 remove unused html serializer 2018-05-18 15:22:24 +01:00
Matthew Hodgson
e51554c626 actually hook up RTE 2018-05-17 02:13:17 +01:00
Matthew Hodgson
ae208da805 nudge towards supporting formatting buttons in MD 2018-05-17 00:01:23 +01:00
Matthew Hodgson
4eb6942211 let onChange set originalEditorState 2018-05-15 01:16:06 +01:00
Matthew Hodgson
b60ccad29b Merge branch 'develop' into matthew/slate 2018-05-15 01:00:07 +01:00
Matthew Hodgson
12a56e8b8e remove spurious comment 2018-05-15 00:59:55 +01:00
David Baker
7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
Luke Barnard
e0236c3d3e Fix issue with sticker picker rendering off-screen 
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
 2018-05-14 17:12:45 +01:00
Luke Barnard
3761cd4054 When panels are shown/hidden, hide sticker picker 2018-05-14 16:35:12 +01:00
Michael Telatynski
a88cbef331
tidy and switch to lexicographic sorting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-14 16:22:28 +01:00
Michael Telatynski
5ef0eece9a
refactor and sort 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-14 16:09:22 +01:00
Luke Barnard
49a3770e92 Merge branch 'release-v0.12.4' into develop 2018-05-14 14:31:18 +01:00
Richard Lewis
dddd1c43cc Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 14:23:26 +01:00
Richard Lewis
986fb3237d Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 13:56:39 +01:00
Luke Barnard
98c06315cf Update widget state when account data changes 2018-05-14 11:14:49 +01:00
Matthew Hodgson
c1000a7cd5 emojioneify the composer 
and also fix up the selectedness CSS for pills and emoji
 2018-05-14 03:02:12 +01:00
Matthew Hodgson
7ecb4e3b18 remove dead removeMDLinks code 2018-05-13 23:35:39 +01:00
Matthew Hodgson
7405b49b44 unify setState() and onChange() 
also make emoji autocomplete work again
also remove the onInputContentChanged prop
also slateify the onInputStateChanged prop
 2018-05-13 23:34:00 +01:00
Matthew Hodgson
a247ea2f77 delete duplicate propTypes(!!!) 2018-05-13 22:43:20 +01:00
Matthew Hodgson
ddfe0691c4 fix insert_mention 2018-05-13 22:41:39 +01:00
Matthew Hodgson
dd0726f068 fix navigating history downwards on tall messages; remove obsolete code 2018-05-13 21:17:43 +01:00
Matthew Hodgson
721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Matthew Hodgson
79f7c5d6ab remove // support, as it never worked 
if you want to escape a /, do it with \/ or just precede with a space
 2018-05-13 03:29:56 +01:00
Matthew Hodgson
4c3588d260 don't lose focus after a / command 2018-05-13 03:26:22 +01:00
Matthew Hodgson
5605439e76 autocomplete polishing 
* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
 2018-05-13 03:17:14 +01:00
Matthew Hodgson
877a6195ae unbreak history scrolling for pills & emoji 2018-05-13 00:54:01 +01:00
Matthew Hodgson
33eaa84bdf fix NPEs when deleting mentions 2018-05-13 00:48:52 +01:00
Matthew Hodgson
c91dcffe82 fix cursor behaviour around pills 2018-05-13 00:40:54 +01:00
Travis Ralston
9e11720191 Add setting to enable widget screenshots (if widgets declare support) 
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-12 14:30:59 -06:00
Matthew Hodgson
9c0c806af4 correctly send pills in messages 2018-05-12 20:04:58 +01:00
Matthew Hodgson
d7c2c8ba7b include the plaintext representation of a pill within it 2018-05-12 16:21:36 +01:00
Matthew Hodgson
410a1683fe make autocomplete selection work 2018-05-12 01:10:38 +01:00
Luke Barnard
9c5c5e282b Send visibility only when changed, and messaging is available 2018-05-11 18:20:23 +01:00
Luke Barnard
06919e22d6 When stickerpicker made visible, send visibility over postMessage 2018-05-11 18:20:00 +01:00
Luke Barnard
42c59b5923 Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 18:17:48 +01:00
Luke Barnard
2d2b529f80 Use new ContextualMenu component in Stickerpicker 2018-05-11 18:17:35 +01:00
Luke Barnard
06898394eb Send visibility only when changed, and messaging is available 2018-05-11 18:06:58 +01:00
Luke Barnard
8b049b2182 When stickerpicker made visible, send visibility over postMessage 2018-05-11 16:51:03 +01:00
Luke Barnard
746eeee33c Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 15:07:51 +01:00
Luke Barnard
2dc51c516c Use new ContextualMenu component in Stickerpicker 2018-05-11 14:47:57 +01:00
Luke Barnard
0a326dc6a0 Take feature_sticker_messagse out of labs 2018-05-09 17:28:29 +01:00
Luke Barnard
7d0406b430
Merge pull request #1883 from matrix-org/luke/cement-sticker-messages 
Take feature_sticker_messagse out of labs
 2018-05-09 16:52:20 +01:00
Luke Barnard
e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Richard Lewis
8e1ba6d139 Always allow users to edit their user widgets. 2018-05-08 22:44:49 +01:00
Richard Lewis
b5320444a9 Fix current user and creator user ID properties. 2018-05-08 22:05:53 +01:00
Matthew Hodgson
8b2eb2c400 make history work again 2018-05-08 01:54:06 +01:00
Matthew Hodgson
ff42ef4a58 make it work for MD mode (modulo history) 2018-05-06 22:08:36 +01:00
Michael Telatynski
f0b7fd58b9
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-06 19:28:18 +01:00
Michael Telatynski
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
Matthew Hodgson
190f6d9483 make slate actually work as a textarea 2018-05-06 15:27:27 +01:00
Matthew Hodgson
a2233a48c2 stub out yet more 2018-05-06 01:18:26 +01:00
Matthew Hodgson
05eba3fa32 stub out more until it loads... 2018-05-06 00:18:11 +01:00
Matthew Hodgson
f4ed820b6f fix stubbing 2018-05-05 23:38:14 +01:00
Matthew Hodgson
e62e43def6 comment out more draft stuff 2018-05-05 23:25:04 +01:00
Matthew Hodgson
02947063d3 Merge branch 'develop' into matthew/slate 2018-05-05 22:45:44 +01:00
Michael Telatynski
71a12b6bbb
fix getDefaultProps mixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-03 11:23:41 +01:00
Michael Telatynski
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
Michael Telatynski
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 18:15:12 +01:00
Michael Telatynski
db55f87699
avoid .done and .then anti-pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-01 18:14:35 +01:00
Luke Barnard
4d8394954c Only create one group store listener in RoomList 
Instead of creating several and destroying the reference to the one
created before.
 2018-05-01 14:24:58 +01:00
Luke Barnard
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor 
Refactor GroupStores into one global GroupStore
 2018-05-01 12:33:06 +01:00
Luke Barnard
28e8ce967f Correctly unregister group store listener when unmounting RoomList 2018-05-01 11:38:57 +01:00
Luke Barnard
023daef4b7 Refactor GroupStores into one global GroupStore 
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.

Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
 2018-05-01 11:24:17 +01:00
Luke Barnard
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons 
Hide inline encryption icons except when hovering over a message
 2018-04-30 17:57:22 +01:00
Eric Newport
e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Eric Newport
55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04:00
Michael Telatynski
68dd57f56e
rename two methods 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:47:18 +01:00
Richard Lewis
b2d6dd8f6e Optionally hide widget popout button. 2018-04-25 16:28:27 +01:00
Michael Telatynski
d680d805ce
Merge branch 'develop' into t3chguy/m.relates_to 2018-04-23 10:14:48 +01:00
Eric Newport
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
Matthew Hodgson
75a2be1a8d WIP (doesn't build yet) replacing draft with slate 2018-04-23 01:13:18 +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
58cd585e86
start of BigMerge fixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:12:02 +01:00
Matthew Hodgson
4da804fd64 Merge branch 'develop' into matthew/fix_layering 2018-04-15 23:59:09 +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
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
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
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
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
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
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
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00: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
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
David Baker
31b772997e Option to remove the presence feature by HS 
Adds a config option that disables showing presence for certain
HS URLs, so we can disable it on matrix.org where the feature is
turned off.
 2018-03-19 16:47:12 +00:00
Michael Telatynski
0ed3563748
clear quoting event even on send fail, as then we can click retry 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-16 00:03:50 +01:00
Luke Barnard
8672b97f9a Improve room list performance when receiving messages 
In summary this makes RoomTiles (and RoomAvatars) do more for
themselves in terms of reacting individually to state changes in
the js-sdk.

Instead of force updating the entire room list for avatar changes
and room name changes, do this in the RoomTile and RoomAvatar
instead. This increases the number of listeners listening to the
matrix client, but allows us to properly implement a
shouldComponentUpdate for RoomTile (because the avatar, name and
notification count are now in component state)
 2018-03-14 14:29:55 +00:00
Richard Lewis
b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Michael Telatynski
14f29e4740
fix the bugs Tulir found - THANKS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:37:42 +00:00
Richard Lewis
e36ae3cede Fix context menu offset. 2018-03-08 17:33:07 +00:00
Richard Lewis
3ab8b1f866 Hide sticker picker delete button and show minimise button. 2018-03-08 17:20:42 +00:00
Luke Barnard
a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Luke Barnard
5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button 
E2E "fudge-button"
 2018-03-08 15:07:58 +00:00
Luke Barnard
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
Richard Lewis
7f91b47598 Move sticker picker icon. 2018-03-07 11:52:42 +00:00
Richard Lewis
e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
Luke Barnard
a95f6a9804 Implement transparent RoomTile for use in some places 
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
 2018-03-05 12:36:02 +00:00
Michael Telatynski
df56a67fda
Add reply fallback and run gen-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-04 12:39:34 +00:00
Luke Barnard
d3dc2a33b4 Fix bug preventing setting room power levels 
- don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
 2018-02-28 16:32:20 +00:00
Luke Barnard
9a72e69a43 Handle lack of room directory visibility response 2018-02-28 16:14:18 +00:00
Luke Barnard
dd529791fb Remove unused prop 2018-02-28 16:13:01 +00:00
Richard Lewis
57c98d96a5 Update widget type. 2018-02-27 13:40:21 +00:00
Richard Lewis
ef4d13715a Wrap menu close in timeout to avoid element disappearing unexpectedly. 2018-02-27 11:29:14 +00:00
Richard Lewis
8e7564b9a3 Wrap the close menu trigger in a timeout 2018-02-26 17:47:52 +00:00
Richard Lewis
b64736aa44 Add listener to close stickerpicker. 2018-02-26 13:43:16 +00:00
Richard Lewis
e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +00:00
Richard Lewis
86461bc88f Disable all widget assets on widget removal. 2018-02-24 00:10:28 +00:00
Richard Lewis
332892fee6 Pull in changes from develop 2018-02-23 17:30:42 +00:00
Matthew Hodgson
3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg 
Give emptySubListTip a container for correct bg colour
 2018-02-23 16:36:10 +00:00
Richard Lewis
b2bf4d4709 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Richard Lewis
9b667f2c38 Reduce logging. 2018-02-23 15:26:47 +00:00
Richard Lewis
88288ff3f5 Add error handling for failure to connect to integration manager. 2018-02-23 10:20:16 +00:00
Richard Lewis
9a5c916570 Close modal on integration manager launch. 2018-02-22 15:36:01 +00:00
Richard Lewis
ce560c577f Fix link spacing 2018-02-22 15:20:51 +00:00
Michael Telatynski
665ddccb0d
restrict to m.text for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:45:25 +00:00
Michael Telatynski
90f9badbf3
s/Reply/ReplyThread/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:40:19 +00:00
David Baker
fd90a8b23c
Merge pull request #1756 from matrix-org/luke/fix-recent-ordering 
Make RoomListStore aware of Room.timeline events
 2018-02-20 10:17:16 +00:00
Michael Telatynski
34b427d15e
s/quote_event/reply_to_event/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:41:07 +00:00
Michael Telatynski
f1a3592eff
fix 12/24h in Reply/ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:14:03 +00:00
Michael Telatynski
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
Michael Telatynski
8062494692
show replies in ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 20:58:39 +00:00
Travis Ralston
cbeee72062
Don't show empty custom tags when filtering tags 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-02-16 10:11:04 -07:00
Michael Telatynski
2e3cbb309e
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-02-16 14:35:04 +00:00
Luke Barnard
94a0a90457 Make RoomListStore aware of Room.timeline events 
so that we can do reorderings of lists ordered by most recent event.

No optimisations here; we only update for timeline events
on live timelines that could update the "unread count".
 2018-02-16 14:16:50 +00:00
Luke Barnard
57419a7f8d Give emptySubListTip a container for correct bg colour 2018-02-15 14:11:45 +00:00
David Baker
ceec405519 Remove RoomListStore listener 
This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
 2018-02-15 11:23:00 +00:00
David Baker
46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets 
Store component state for editors
 2018-02-14 11:33:48 +00:00
Luke Barnard
8377abcd19 Store component state for editors 
to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
 2018-02-13 12:01:36 +00:00
Luke Barnard
db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Luke Barnard
7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Aidan Gauland
0fd9b3e9b2 Avoid doubling up username in read receipt view 
In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because
RoomMember.name may already include the username, which we are going to add
ourselves.
 2018-02-11 16:27:07 +13:00
Aidan Gauland
97ce84c8e3 Add display name to the read receipt view 
Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
 2018-02-11 16:14:17 +13:00
Michael Telatynski
fbb950e064
mass s/Quote/Reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-10 12:38:25 +00:00
Michael Telatynski
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
Richard Lewis
55593416fa Hide apps drawer when viewining room settings. 2018-02-09 13:23:34 +00:00