Matthew Hodgson
4972a234c4
Merge branch 'develop' into matthew/slate
2018-05-19 12:58:43 +01:00
Matthew Hodgson
b60ccad29b
Merge branch 'develop' into matthew/slate
2018-05-15 01:00:07 +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
Luke Barnard
49a3770e92
Merge branch 'release-v0.12.4' into develop
2018-05-14 14:31:18 +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
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
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
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
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
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
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
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
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
Richard Lewis
8e1ba6d139
Always allow users to edit their user widgets.
2018-05-08 22:44:49 +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
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
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
Michael Telatynski
bbce6eea5b
update comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +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
David Baker
74651b93ab
Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog
2018-04-27 15:57:15 +01:00
David Baker
27b18c457e
Lint
2018-04-27 15:56:28 +01:00
David Baker
efd29193b7
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-27 15:23:35 +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
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
Richard Lewis
b2d6dd8f6e
Optionally hide widget popout button.
2018-04-25 16:28:27 +01:00