a7259b31b6
first set of model tests
2019-07-25 14:50:20 +02:00
9bfba9db3e
make PartCreator a bit more testable by not asking for deps of dep
2019-07-25 14:50:20 +02:00
419c800167
add tests for diffAtCaret
2019-07-25 14:50:20 +02:00
595dc82543
unit test + fixes + comments + simplication for diffDeletion
2019-07-25 14:50:20 +02:00
cef67d5784
Merge pull request #3245 from matrix-org/jryans/tooltip-larger-buffer
...
Tweak interactive tooltip buffer area allow for overshoot
2019-07-25 13:16:20 +01:00
f5fbd30a28
Tweak interactive tooltip buffer area allow for overshoot
...
This uses a larger buffer area around the tooltip, as it easy to overshoot and
mouse the cursor past the tooltip.
Fixes https://github.com/vector-im/riot-web/issues/10400
2019-07-25 12:17:07 +01:00
7296fb8fd3
Merge pull request #3243 from matrix-org/jryans/app-perm-url
...
Keep widget URL in permission screen to one line
2019-07-25 11:38:24 +01:00
a5ac50f90f
Merge pull request #3242 from matrix-org/jryans/terms-modal
...
Avoid visual glitch when terms appear for Integration Manager
2019-07-24 14:27:43 +01:00
ac31b4b8f4
Merge pull request #3244 from matrix-org/bwindels/diffhtmledits
...
Show diff for formatted messages in the edit history
2019-07-24 09:59:23 +00:00
3753e5261d
Implement diffing html messages in the edit history
2019-07-24 11:28:56 +02:00
2d4264c39d
Keep widget URL in permission screen to one line
...
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.
Fixes https://github.com/vector-im/riot-web/issues/10402
2019-07-23 18:06:37 +01:00
846a908bb4
Add missing copyright header
2019-07-23 17:52:00 +01:00
e73690439f
Merge pull request #3239 from matrix-org/bwindels/redirectpastetocomposer
...
Redirect paste to composer when event target can't receive input
2019-07-23 16:38:55 +00:00
39d5aa7cf4
Avoid visual glitch when terms appear for IM
...
This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.
To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.
Fixes https://github.com/vector-im/riot-web/issues/10386
2019-07-23 15:11:38 +01:00
58fd828944
Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer
...
Restore manual composing focusing logic
2019-07-23 11:55:44 +00:00
f2bcfea0fb
Revert "fix lint"
...
This reverts commit 5c1c1f64b6
2019-07-23 11:43:44 +02:00
2eb8a8879b
Merge pull request #3199 from matrix-org/dbkr/terms
...
ToS for ISes/IMs: prompt on use screen
2019-07-23 10:32:11 +01:00
1b0d8510a2
Add note from commit message as a comment
2019-07-23 10:09:16 +01:00
82d7617287
add comments
2019-07-23 09:44:17 +02:00
ceb53dc0bb
Revert "remove unnessary manual focussing of composer"
...
This reverts commit 57abbc4273
2019-07-23 09:13:51 +02:00
7d7878245b
Strip path component from IM rest url
...
before passing to js-sdk. We continue to use the full URL for the
calls done by matrix-react-sdk, but the standard terms API called
by the js-sdk lives on the standard _matrix path. This means we
don't support running IMs on a non-root path, but it's the only
realistic way of transitioning to _matrix paths since configs in
the wild contain bits of the API path.
Once we've fully transitioned to _matrix URLs, we can give people
a grace period to update their configs, then use the rest url as
a regular base url.
2019-07-22 18:54:04 +01:00
e3ffdf1dff
Merge pull request #3240 from matrix-org/jryans/defer-im-token
...
Defer IM token until widget is shown and permission granted
2019-07-22 12:56:11 +01:00
84bb0eb696
Remove random capital
2019-07-22 12:25:12 +01:00
b664259e2d
more syntactic sugar
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-22 12:23:55 +01:00
11ecb4ca54
s/terms /policies/
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-22 12:23:28 +01:00
09c2d899ac
Defer IM token until widget is shown and permission granted
...
This defers the work to request the IM token when displaying a widget until
after we know that widget will actually be shown and the user has granted
permission for this widget to be displayed.
This is useful in general to avoid making unnecessary token checks, but it's
particularly helpful with the new Terms API, so that we only show the Terms flow
when widget are actually being used (as opposed to entering the room where
widgets exist, but haven't been shown / permitted).
Part of https://github.com/vector-im/riot-web/issues/10088
2019-07-22 11:50:54 +01:00
023130bb4b
Redirect paste to composer when event target can't receive input
2019-07-19 17:49:04 +02:00
84e2333105
Merge pull request #3226 from matrix-org/bwindels/readmarker-invisble-events
...
Move read marker past invisible events
2019-07-19 15:10:03 +00:00
c335c04c75
Merge pull request #3238 from matrix-org/bwindels/diffplainedits
...
Basic diff visualisation for plain text edits
2019-07-19 14:41:53 +00:00
c713172a37
add proptypes
2019-07-19 16:34:50 +02:00
de1c4e0cfe
better naming
2019-07-19 16:34:39 +02:00
f305d8ac08
Basic diff visualisation for plain text edits
2019-07-19 16:09:23 +02:00
3ee26b6135
Merge pull request #3237 from matrix-org/bwindels/fixcpfocus
...
Don't focus composer on keydown with modifier
2019-07-19 08:54:54 +00:00
77f5274cd8
don't focus composer on keydown with modifier
...
this breaks shortcuts like copy, ...
2019-07-19 09:10:20 +02:00
4fa7302f69
Merge pull request #3224 from matrix-org/bwindels/focus-composer-on-type
...
Focus composer when typing anywhere in the app
2019-07-18 16:10:23 +00:00
03151418af
Merge branch 'master' into develop
2019-07-18 15:51:33 +01:00
3c0c64af8e
v1.4.0
2019-07-18 15:50:46 +01:00
8b0e36e884
Prepare changelog for v1.4.0
2019-07-18 15:50:45 +01:00
480061bde3
Upgrade JS SDK to v2.2.0
2019-07-18 15:46:38 +01:00
4a7264cc15
Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst
...
Don't show remove button for original event in edit history
2019-07-18 14:40:58 +01:00
1b06b9957a
dont show remove button for original event in edit history
2019-07-18 14:40:05 +01:00
6c6300e1cc
Merge pull request #3235 from matrix-org/bwindels/dontredactfirst
...
dont show remove button for original event in edit history
2019-07-18 14:35:07 +01:00
aca41fe80a
dont show remove button for original event in edit history
2019-07-18 14:09:29 +02:00
adc2648b46
Merge pull request #3234 from matrix-org/jryans/v1.4.0/rm-reactions-edits-flags
...
Remove feature flags for reactions and edits
2019-07-18 10:28:57 +01:00
537eb2c88f
Remove reactions feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:23:12 +01:00
25351d552e
Remove editing feature flag
...
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:23:12 +01:00
76a60c84ac
Merge pull request #3233 from matrix-org/jryans/rm-reactions-edits-flags
...
Remove feature flags for reactions and edits
2019-07-18 09:58:55 +01:00
599c49613f
Remove reactions feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-17 17:00:36 +01:00
674f33917f
Remove editing feature flag
...
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-17 16:56:15 +01:00
03f577bea9
use keydown here, as its a div element
2019-07-17 17:23:19 +02:00
Bruno Windels