Michael Telatynski
41af9f7a96
fix changed method name
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 08:23:35 +01:00
Matthew Hodgson
db5fc53853
final comment
2018-04-29 04:53:32 +01:00
Matthew Hodgson
8538cc1666
fix regressions introduced by 00b7cc512b
2018-04-29 04:41:30 +01:00
Matthew Hodgson
be523b3edc
lint
2018-04-29 04:31:30 +01:00
Matthew Hodgson
551d3ebda0
correctly fix up thumbnail height onload.
...
fixes https://github.com/vector-im/riot-web/issues/6492 , although popping is inevitable in
the current implementation as it only fixes up the thumbnail size once the image has loaded.
2018-04-29 04:28:15 +01:00
Matthew Hodgson
731f1fa7d3
clarify another scrolljump bug
2018-04-29 04:00:02 +01:00
Matthew Hodgson
c254d043c5
fix ugly img errors and correctly render SVG thumbnails
...
Fixes https://github.com/vector-im/riot-web/issues/6271
Fixes https://github.com/vector-im/riot-web/issues/1341
2018-04-29 03:58:17 +01:00
Matthew Hodgson
9c5407c21f
revokeObjectURLs
2018-04-29 03:17:55 +01:00
Matthew Hodgson
9701fd32b7
switch back to blob urls for rendering e2e attachments
...
Based on @walle303's work at https://github.com/matrix-org/matrix-react-sdk/pull/1820
Deliberately reverts 8f778f54fd
Mitigates XSS by whitelisting the mime-types of the attachments so that malicious ones
should not be recognised and executed by the browser.
2018-04-29 03:07:31 +01:00
Michael Telatynski
4021fc049c
re-arrange method order to group statics before instance methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:54:54 +01:00
Michael Telatynski
c00c52e537
added another comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:53:35 +01:00
Michael Telatynski
407be88c92
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:51:39 +01:00
Michael Telatynski
5bb15b1002
simplify logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:48:44 +01:00
Michael Telatynski
bbf4d3e39f
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:34:27 +01:00
Eric Newport
55566b35a2
convert attribute to class
2018-04-28 12:39:25 -04:00
David Baker
873993a7ca
Clarify, hopefully
2018-04-27 17:56:33 +01:00
David Baker
d3c368e19f
typo
2018-04-27 17:53:11 +01:00
David Baker
0c309c88ad
Bluebird has no need for your .done()
2018-04-27 17:52:25 +01:00
David Baker
27b18c457e
Lint
2018-04-27 15:56:28 +01:00
David Baker
6d9e07580b
UI fixes in SessionRestoreErrorDialog
...
* Make the 'delete my data' button not the default
* Make it red
* Give it a confirmation dialog
* Remove the 'cancel' button: what does it mean to cancel an error?
In this case, it tried again and almost certainly got the same error.
* Remove the top-right 'x' and don't cancel on esc for the same reason.
* Move 'send bug report' to a button rather than a 'click here' link
* Add a 'refresh' button which, even if it's no more likely to work,
will at least look like it's doing something (it's mostly so if you
don't have a bug report endpoint, there's still a button other
than the one that deletes all your data).
2018-04-27 12:38:49 +01:00
Michael Telatynski
2e29a0857b
improve stripPlainReply comment and fix leading NewLine
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 12:12:01 +01:00
Michael Telatynski
68dd57f56e
rename two methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
Michael Telatynski
3050553fc2
rename and change getInReplyTo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:44:14 +01:00
Michael Telatynski
ca766df598
call onWidgetLoad on componentDidUpdate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:32:04 +01:00
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
David Baker
0323f8ed0c
Wrap exception handling around all of loadSession
...
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.
Remove the catch in MatrixChat that sent you to the login screen. This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
2018-04-27 11:25:13 +01:00
David Baker
db1401f484
Pass false to onFinished from BaseDialog
...
Everywhere else, onFinished takes a boolean indicating whether the
dialog was confirmed on cancelled, and had function that were
expecting this variable and getting undefined.
2018-04-27 11:19:14 +01:00
Michael Telatynski
82d117974f
Remove unused import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:16:29 +01:00
David Baker
f70096b8fa
Fix error handling on session restore
...
Fix a number of failures that meant the excellent error handling
we had for failing to restore a session didn't work.
1. .catch on the promise rather than try/catch: it's async
2. Explicit cancel method in SessionRestoreErrorDialog that invokes
onFinished with `false` because even with the catch fixed, this
was getting the event as its first arg which is truthy, so
clicking cancel still deleted your data.
3. DialogButtons: Don't pass onCancel straight into the button event
handler as this leaks the MouseEvent through as an argument.
Nothing is using it and it exacerbates failures like this
because there are surprise arguments.
Fixes https://github.com/vector-im/riot-web/issues/6616
2018-04-26 17:07:58 +01:00
Luke Barnard
665e052596
Allow debugging of unhandled login errors
2018-04-26 15:09:17 +01:00
David Baker
53528f338a
Replace document.origin with window.location.origin
...
document.origin is not a thing on firefox
2018-04-26 10:43:52 +01:00
David Baker
e26c3f3dc9
Get variable name right in commented usercontent code
2018-04-26 10:12:50 +01:00
Richard Lewis
b2d6dd8f6e
Optionally hide widget popout button.
2018-04-25 16:28:27 +01:00
David Baker
81488b27e2
Merge pull request #1851 from matrix-org/rxl881/popoutWidget
...
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 15:36:07 +01:00
Richard Lewis
0f0e89d394
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 12:49:30 +01:00
David Baker
54040659ec
Fix cross-origin renderer code in comment
2018-04-25 11:35:08 +01:00
David Baker
7720585cea
Merge pull request #1849 from matrix-org/dbkr/cross_origin_renderer_origin_lock
...
Support origin lock in cross-origin renderer
2018-04-25 11:22:48 +01:00
David Baker
80837a9199
s/contian/contain/g
...
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
David Baker
79c3335765
Support origin lock in cross-origin renderer
...
This adds a URL parameter to the cross-origin renderer that makes
it only accept messages from a given domain. This adds an extra
layer of security to the cross-origin iframe and is backwards
compatible in both directions.
2018-04-24 16:05:14 +01:00
David Baker
f5956c87f6
Bind onImageError in constructor
...
Tt uses `this` but wasn't bound anywhere so the error handler was
just throwing an exception.
2018-04-23 18:14:59 +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
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
92c98aa3e5
displayName should be tracked as static
2018-04-18 16:19:37 +01:00
Matthew Hodgson
f84573ec9f
convert HomePage to ES6 and split out the vectory bit
2018-04-18 10:23:32 +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
Luke Barnard
fca7325b20
Change comments
2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285
Add 500ms delay to show membershipBusy
for longer
...
to avoid a UI that flashes quickly
2018-04-10 15:31:04 +01:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update
...
Improve group join/leave feedback
2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb
Factor out _closeSettings
for cleanliness
2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1
Show membership spinner next to Leave/Join button when leaving/joining
2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0
Hide settings after leaving a group
2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7
Fetch group data when leaving or joining to update the view
2018-04-10 10:03:54 +01:00
Matthew Hodgson
0ff2837d7f
rename createGroupButton to not be a total misnomer...
2018-04-09 23:02:59 +01:00
Matthew Hodgson
2d8880ec5f
patch NPE on Pill when lazyloading members
2018-04-09 23:02:15 +01:00
Luke Barnard
2da45277cd
Update group join button to match new API
2018-04-09 16:57:27 +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
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar
...
Make stickers/messages continuations of each other
2018-04-06 17:58:26 +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
Luke Barnard
1e586428ac
Update to match is_openly_joinable API
2018-04-06 14:58:10 +01:00
Luke Barnard
adb78c2931
Fix broken ForgotPassword component
2018-04-06 10:27:03 +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
Luke Barnard
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
...
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00
David Baker
03747b8287
Update to use new join_policy API
2018-04-05 16:56:35 +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
Richard Lewis
369cbdaaf6
Add missing PropType declarations.
2018-04-04 13:38:07 +01:00
Richard Lewis
702380c591
Add props to style (remaining) menu padding attributes.
2018-04-04 13:37:52 +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