Commit graph

10297 commits

Author SHA1 Message Date
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
86abf8bf50
Merge pull request #1996 from matrix-org/dbkr/unlabs_replies
Take replies out of labs!
2018-06-20 10:10:24 +01:00
David Baker
e5a509bb91 i18n & prunei18n 2018-06-20 10:04:03 +01:00
David Baker
2e2c347ef7 Merge remote-tracking branch 'origin/develop' into dbkr/unlabs_replies 2018-06-20 10:03:05 +01:00
David Baker
0e8b4ac2ad i18n & prunei18n 2018-06-20 10:01:09 +01:00
David Baker
e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski
1352abf317
Merge pull request #1987 from matrix-org/luke/fix-matrix-to-regex
re-merge reset PR
2018-06-18 19:44:03 +01:00
Michael Telatynski
9de6bf4f5a
once command has a space, strict match instead of fuzzy match
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit a852033)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 19:36:11 +01:00
Michael Telatynski
107802fa29
simplify arrow func
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 19:34:46 +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
d6f0f77561 Fix MATRIXTO_URL_PATTERN RegExp groups
Fixes https://github.com/vector-im/riot-web/issues/6900
Fixes https://github.com/vector-im/riot-web/issues/6899
2018-06-18 17:46:22 +01:00
Luke Barnard
bea52eccf8 Remove unused import, constant 2018-06-18 17:40:48 +01:00
Luke Barnard
ad76f1bce6
Merge pull request #1984 from matrix-org/dbkr/fix_stickers
Fix blank sticker picker
2018-06-18 16:08:36 +01:00
David Baker
276c7a9c4d Fix blank sticker picker
Let the battle of z-indexes commence

https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29
2018-06-18 15:24:34 +01:00
David Baker
499bb5cfb4
Merge pull request #1972 from matrix-org/t3chguy/media_fixes
fix e2ee file/media stuff
2018-06-18 13:56:00 +01:00
David Baker
e7aa2ae009
Merge pull request #1978 from matrix-org/t3chguy/right_click_contextmenu
right click for room tile context menu
2018-06-18 13:53:20 +01:00
David Baker
0d05250914
Merge pull request #1983 from matrix-org/t3chguy/fix_filepanel_showing_roomavatar
only show m.room.message in FilePanel
2018-06-18 13:48:39 +01:00
Michael Telatynski
1ae51a8332
use changed argument in js-sdk
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 13:48:23 +01:00
Michael Telatynski
f88a2fd8fc
make GroupInviteTile context menu appear where you right clicked instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 12:16:33 +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
David Baker
1ab902d738
Merge pull request #1981 from matrix-org/t3chguy/improve_command_provider
improve command provider
2018-06-18 11:51:06 +01:00
David Baker
d1982c8317
Merge pull request #1980 from matrix-org/t3chguy/fix_copy-code-block_hscroll
affix copyButton so that it doesn't get scrolled horizontally
2018-06-18 11:23:48 +01:00
David Baker
a32ffa83ef
Merge pull request #1979 from matrix-org/t3chguy/max_continuation_interval
split continuation if there is a gap in conversation
2018-06-18 11:22:51 +01:00
David Baker
a918d73c29
Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings
fix a bunch of instances of react console spam
2018-06-18 10:47:20 +01:00
David Baker
210d920a92
Merge pull request #1949 from matrix-org/luke/track-uisis-piwik
Track decryption success/failure rate with piwik
2018-06-18 10:12:26 +01:00
Luke Barnard
2379d42162
Merge pull request #1975 from matrix-org/t3chguy/route_matrixto_group_links
route matrix.to/#/+... links internally (not just group ids)
2018-06-18 09:35:46 +01:00
Michael Telatynski
eb32dda260
given we also want to hide widget events, hide all except m.room.message
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 19:52:15 +01:00
Michael Telatynski
b87824ba92
hide m.room.avatar from FilePanel via sync filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 19:50:51 +01:00
Michael Telatynski
477cb56591
Merge pull request #1976 from matrix-org/t3chguy/ctrl-k_enter
implement `hitting enter after Ctrl-K should switch to the first result`
2018-06-16 19:16:52 +01:00
Michael Telatynski
a50f6094cc
allow / + wait to also show all commands
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 16:44:13 +01:00
Michael Telatynski
f152ad84b8
Improve CommandProvider for Autocomplete
improve Regexp so it leaves autocomplete up whilst typing arguments
improve completion so it doesn't discard your arguments on-hover
add a way to list all commands by using `/<TAB>`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 16:40:44 +01:00
Michael Telatynski
fd90992294
s/onClick/onChange on checkbox to make React happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 15:58:16 +01:00
Michael Telatynski
01a6b7f77f
affix copyButton so that it doesn't get scrolled horizontally
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 10:27:42 +01:00
Michael Telatynski
7d19841e68
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 09:48:57 +01:00
Michael Telatynski
61e09395d0
split continuations if longer than N
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 09:45: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
1afdb0e3c0
add null-guard
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:44:57 +01:00
Michael Telatynski
8971211639
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:42:40 +01:00
Michael Telatynski
efaccf7344
implement hitting enter after Ctrl-K should switch to the first result
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:42:28 +01:00
Michael Telatynski
3ebec92ac5
replace hardcoded matrix.to with reference to const in matrix-to
for easier changing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:27:47 +01:00
Michael Telatynski
4f693a1ff5
implement group links in matrixLinkify:MATRIXTO. Simplify if/else w/ map
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:27:17 +01:00
Michael Telatynski
43681026b8
s/onClick/onChange because react cries about it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 19:01:12 +01:00
Michael Telatynski
a899871d52
specify unique key to make react happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:55:37 +01:00
Michael Telatynski
a7f5059aca
add nop to fix onClick being required warning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:55:21 +01:00
Michael Telatynski
a2219472f6
inline redundant bodyNodes, fixes react no unique key warning too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:47:15 +01:00
Michael Telatynski
5fbadbc44f
comment out visibility:hidden div as it seems unfinished
and refers to undefined method `this._onJoinGroupClick`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:42:51 +01:00
Michael Telatynski
856d1ee5f9
fix: Invalid prop focus of type string supplied to DialogButtons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:39:12 +01:00
Luke Barnard
b0a2772889 Use more consistent start/stop pattern 2018-06-15 17:58:43 +01:00