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
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
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
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
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
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
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
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
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
73b49d6d5e
Merge pull request #1968 from matrix-org/t3chguy/fix_QuestionDialog
...
QuestionDialog pass hasCancelButton to DialogButtons
2018-06-15 10:58:54 +01:00
David Baker
88a807d89b
Merge pull request #1965 from matrix-org/t3chguy/show_redacted_sticker
...
check type before msgtype in the case of `m.sticker` with msgtype
2018-06-15 10:56:33 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
826df5765c
add rel noopener to cross origin loader (currently rel="undefined")
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 10:27:21 +01:00
Michael Telatynski
7adbff69dc
QuestionDialog pass hasCancelButton to DialogButtons
...
otherwise E2E Q Dialog has OK and Cancel which makes 0 sense
as its just an info dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:58:38 +01:00
Michael Telatynski
7de7275c6d
remove subheadings in ShareDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:56:46 +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
Luke Barnard
5077e9e89b
Merge pull request #1958 from matrix-org/dbkr/widget_waiting
...
Fix widgets re-appearing after being deleted
2018-06-14 17:31:23 +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
Luke Barnard
2eb23ed234
Add loadedImageDimensions to initial state
2018-06-14 15:53:49 +01:00
Luke Barnard
2d14d51ecb
Handle images without width/height info correctly
...
Prior to #1912 , height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.
Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.
At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.
Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
2018-06-14 15:44:55 +01:00
Luke Barnard
c8d233c0a6
If unspecified, don't crash if missing thumbnail info
...
applies to stickers/images.
We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
2018-06-14 14:19:30 +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
4e216714b5
remove commented code and move modal.close into a finally block
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:53:02 +01:00
Michael Telatynski
33a3cfead6
controlled checkboxes use checked
not value
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:47:33 +01:00
Michael Telatynski
ef178b282c
use getters on MatrixEvent for roomId and eventId
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:44:05 +01:00
Michael Telatynski
bef435e15a
allow ShareEvent to devolve into ShareRoom using checkbox + i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:41:12 +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
Michael Telatynski
aa7d62b740
fix naming of methods and fields
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:20:16 +01:00
Michael Telatynski
9a225840ce
check type before msgtype in the case of m.sticker
with msgtype (undef)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 12:00:53 +01:00
Luke Barnard
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
...
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +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
Michael Telatynski
d4578783ef
apply pr review feedback
...
fix copyright headers
fix user settings link accessibility
fix typo and add noopener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 18:46:02 +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
David Baker
94125fb566
Fix widgets re-appearing after being deleted
...
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
* User presses delete, send POST req, we set `deleting`. Widget hides.
* POST request completes, we unset `deleting` so widget unhides.
* State event comes down sync so widget hides again.
This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.
Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
2018-06-13 15:50:19 +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
Luke Barnard
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn
...
add mx_filterFlipColor to mx_MemberInfo_cancel img
2018-06-13 10:04:23 +01:00
Michael Telatynski
20caea47f8
make more generic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +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
22bec0d67d
allow CreateRoom to scale properly horizontally
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +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
9dd2184b33
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:29:05 +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
18546dbe06
QR Code align [m] logo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:33:38 +01:00
Michael Telatynski
d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +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
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:21:55 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-06-11 14:24:40 +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
ffec32c7d9
Merge pull request #1943 from akihikodaki/react
...
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3
Import react as React in src/components/views/elements/DNDTagTile.js
...
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00
Travis Ralston
254e8c358a
Remove unused imports
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-28 11:38:09 -06:00
Travis Ralston
98613748b6
Move Scalar Widget URL check to WidgetUtils
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:12:55 -06:00
Travis Ralston
23162c8625
Support third party integration managers in AppPermission
...
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:56:50 -06: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
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
...
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
Richard Lewis
6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools
...
Make devTools styling more consistent and easier to edit event data.
2018-05-24 18:10:59 +01:00
Luke Barnard
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update
...
Cookie bar update
2018-05-24 17:19:05 +01:00
Luke Barnard
fd8d501732
Update cookie bar wording
2018-05-24 16:58:14 +01:00
Luke Barnard
24aeda2e05
Fix bug where usage data link not visible when no cookie policy url
2018-05-24 16:52:04 +01:00
Richard Lewis
9753ee8d82
Better check of jitsi widget message origin.
2018-05-24 16:14:18 +01:00
Richard Lewis
a13d58f6c2
More thorough check of IM URL validity.
2018-05-24 14:58:59 +01:00
Luke Barnard
aae89efa01
Add usage data link to cookie bar
...
this opens the analytics modal
2018-05-24 12:47:27 +01:00
Luke Barnard
03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword
...
Change wording and appearance of Deactivate Account dialog
2018-05-24 12:02:10 +01:00
Luke Barnard
dca1217a45
Change wording and appearance of Deactivate Account dialog
2018-05-24 11:50:45 +01:00
Matthew Hodgson
3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering
...
fix membership list ordering when presence is disabled.
2018-05-24 11:29: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
Richard Lewis
2a9859c7b6
Styling for consistency.
2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce
Make devTools styling more consistent and easier to edit event data.
2018-05-23 17:18:33 +01:00
Luke Barnard
b124989968
Implement erasure option upon deactivation
2018-05-23 16:33:32 +01:00
Matthew Hodgson
b0ff61f7ef
switch code schema to match slate-md-serializer
2018-05-23 14:12:08 +01:00
Luke Barnard
ba3dd0c87a
Refactor onOk to async function
2018-05-23 13:35:42 +01:00
Luke Barnard
ef686a966d
Add cookie warning to widget warning (AppPermission)
2018-05-23 10:46:32 +01:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
...
Terms and Conditions dialog
2018-05-23 10:17:14 +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
Richard Lewis
6df3371c6c
Add a "reload widget" button.
2018-05-22 19:14:54 +01:00
Luke Barnard
538979a4ee
Fix MVideoBody spinner
2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5
Grammar
2018-05-22 16:09:54 +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
Luke Barnard
31dcd85c08
Add customisable cancel button to QuestionDialog
2018-05-22 15:45:58 +01:00
Luke Barnard
fb5dd4a410
Remove spurious fixupHeight
2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32
Only include placeholder in DOM when necessary
2018-05-22 10:43:16 +01:00
Luke Barnard
e9ae3de00f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef
Factor out all shared logic between MStickerBody and MImageBody
...
The benefits of this:
- One code path for determining spinner/placeholder and it's position
for loading images/stickers. This includes spinner used in e2e
decryption of images.
- Very small definition for MStickerBody, only overriding the minimal
differences is has from MImageBody.
The disadvantages:
- Slightly more complicated MImageBody, but hopefully not less
readable.
2018-05-21 16:59:13 +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
4972a234c4
Merge branch 'develop' into matthew/slate
2018-05-19 12:58:43 +01:00
Matthew Hodgson
089ac337f4
remove unused html serializer
2018-05-18 15:22:24 +01:00
Luke Barnard
015093b371
Move inline style to stylesheet
2018-05-18 11:34:41 +01:00
David Baker
5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics
...
Implement opt-in analytics with cookie bar
2018-05-18 10:44:53 +01:00
Luke Barnard
7e7e2a7473
Add more comments to explain thumbnail sizing
2018-05-18 10:27:22 +01:00
Luke Barnard
d11442de04
Adjust comment
2018-05-18 10:15:59 +01:00
Luke Barnard
b41b9aa4fa
Remove fixupHeight call from MStickerBody
2018-05-18 09:58:52 +01:00
Luke Barnard
bbcf2fea53
Fix e2e image thumbnail spinner containing box correct size
2018-05-18 09:47:49 +01:00
Luke Barnard
b28ed6075b
Implement slightly hacky CSS soln. to thumbnail sizing
...
As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.
The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
2018-05-17 18:15:34 +01:00
David Baker
a7006307bf
Call afterComponentDidMount() after componentDidMount
2018-05-17 16:50:16 +01:00
David Baker
e53497421e
Fix image size jumping regression
...
Fixes https://github.com/vector-im/riot-web/issues/6654
2018-05-17 16:47:17 +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
Luke Barnard
d15051a635
Add policyLink configuration to piwik
...
Also:
- Make CookieBar ES6 class
- Alter phrasing on CookieBar
- Conditionaly display longer "...(See our ++cookie and privacy
policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
Luke Barnard
4e6594d64b
Allow arbitrary hrefs for cookie/privacy links
2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7
Implement opt-in analytics with cookie bar
2018-05-16 15:20:38 +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
Luke Barnard
e596924074
Merge branch 'develop' into release-v0.12.4
2018-05-14 17:43:40 +01:00
Luke Barnard
ff0254d346
Fix ContextualMenu imports for TagTile and code block copy button
2018-05-14 17:36:57 +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
David Baker
b6e317647a
Fix stickers briefly being 2x the size
...
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
2018-05-14 13:41:41 +01:00
Luke Barnard
cf8077e605
Set loading: false when iFrame finishes loading
2018-05-14 11:42:38 +01:00
Luke Barnard
6345e474f5
Remove unused conditional
2018-05-14 11:38:17 +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
f8fd90c559
Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag
...
T3chguy/replies html tag
2018-05-12 20:22:54 +01: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
Michael Telatynski
dbbcabfed8
switch from asymmetrical fallback form to a cleaner one mx-reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-12 15:58:25 +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
a419056040
Delinting
2018-05-11 18:20:14 +01:00
Luke Barnard
06919e22d6
When stickerpicker made visible, send visibility over postMessage
2018-05-11 18:20:00 +01:00
Luke Barnard
bd0301c666
Add API to send visibiliy actions to widgets
2018-05-11 18:17:55 +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
1f2f3474ed
Delinting
2018-05-11 17:28:12 +01:00
Luke Barnard
8b049b2182
When stickerpicker made visible, send visibility over postMessage
2018-05-11 16:51:03 +01:00
Luke Barnard
4b6378a80d
Add API to send visibiliy actions to widgets
2018-05-11 16:22:54 +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
770e2d400e
Improve appearance of short-lived app loading spinner
...
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 17:28:41 +01:00
Luke Barnard
0a326dc6a0
Take feature_sticker_messagse out of labs
2018-05-09 17:28:29 +01:00
Luke Barnard
97b9316ec7
Fix issue incorrect positioning with widget loading indicator
...
by making sure to apply the correct CSS class to the parent
2018-05-09 17:28:18 +01:00
Luke Barnard
0c1846630c
Improve appearance of short-lived app loading spinner
...
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 16:54:01 +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
bcf003757c
Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner
...
Fix issue incorrect positioning with widget loading indicator
2018-05-09 16:52:11 +01:00
Luke Barnard
59cbaf67bb
Fix issue incorrect positioning with widget loading indicator
...
by making sure to apply the correct CSS class to the parent
2018-05-09 15:48:53 +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
Luke Barnard
337af1643f
Merge pull request #1878 from matrix-org/t3chguy/m.relates_to
...
Replies: un-break click-to-mention on SenderProfile for reply&preview
2018-05-08 14:15:59 +01:00
Matthew Hodgson
afb9e1f5f4
blind fix to the overlapping sticker bug
2018-05-08 09:50:06 +01:00
Matthew Hodgson
984961a3ed
blind fix to the overlapping sticker bug
2018-05-08 09:49: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
8a1bd8da69
tell eslint to ignore viewAvatarOnClick being unused
2018-05-06 00:22:14 +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
500f58a963
fix deeply irritating react warning about viewAvatarOnClick on BaseAvatar
2018-05-05 23:25:50 +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
Matthew Hodgson
af5be5c36c
appease the fascist linter
2018-05-05 22:28:09 +01:00
Matthew Hodgson
14bcfdd5c6
fix NPE
2018-05-05 22:08:37 +01:00
Michael Telatynski
97d344483e
fix thinko when changing from ClientPeg to context in static method (DUH
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 14:32:13 +01:00
Michael Telatynski
4892694e77
use more explicit reply fallback closing tag construct to fix 6657
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:24:10 +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
Michael Telatynski
11ae0805b0
re-order ReplyThread methods for readability
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 17:42:58 +01:00
Luke Barnard
56ec7713bb
Refresh group rooms and members when selecting a tag
2018-05-01 16:54:14 +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
38d7a5d394
Remove GroupStore listener when unmounting GroupPublicityToggle
2018-05-01 11:50:14 +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
Michael Telatynski
bbce6eea5b
update comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +01:00
Matthew Hodgson
5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls
...
Switch back to using blob URLs for rendering e2e attachments
2018-04-30 19:01:58 +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
Luke Barnard
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog
...
Fix UX issues with bug report dialog
2018-04-30 17:56:19 +01:00
Eric Newport
e037cf0063
namespace CSS better and fix bug
2018-04-30 12:22:16 -04:00
David Baker
5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors
...
fix ugly img errors and correctly render SVG thumbnails
2018-04-30 17:12:40 +01:00
David Baker
025bffb4e9
Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog
2018-04-30 16:20:12 +01:00
David Baker
e28a927da9
lint
2018-04-30 14:34:14 +01:00
David Baker
c3420c37fd
Indentation
2018-04-30 14:25:42 +01:00
David Baker
54cccab0c7
Factor out clearStorageButton
2018-04-30 14:22:18 +01:00
David Baker
5d46efc3e8
Get docs right on hasCancel
2018-04-30 14:17:21 +01:00
David Baker
dcaacfd204
Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux
2018-04-30 14:06:32 +01:00
David Baker
a9b6db3f2e
Lint
2018-04-30 13:41:04 +01:00
David Baker
37cb8abf13
Fix UX issues with bug report dialog
...
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
escape to cancel works)
* Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
about submitting logs.
* Continued campaign against 'Click here' links.
Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-30 13:39:46 +01:00
David Baker
fc136607f1
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-30 13:39:46 +01:00
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
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
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
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
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
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
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
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