PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
16843 commits 1 branch 0 tags 338 MiB
Commit graph

16843 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
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
Bruno Windels
3753e5261d Implement diffing html messages in the edit history 2019-07-24 11:28:56 +02:00
Bruno Windels
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
Bruno Windels
58fd828944
Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer 
Restore manual composing focusing logic
 2019-07-23 11:55:44 +00:00
Bruno Windels
f2bcfea0fb Revert "fix lint" 
This reverts commit 5c1c1f64b6.
 2019-07-23 11:43:44 +02:00
David Baker
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
David Baker
1b0d8510a2 Add note from commit message as a comment 2019-07-23 10:09:16 +01:00
Bruno Windels
82d7617287 add comments 2019-07-23 09:44:17 +02:00
Bruno Windels
ceb53dc0bb Revert "remove unnessary manual focussing of composer" 
This reverts commit 57abbc4273.
 2019-07-23 09:13:51 +02:00
David Baker
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
J. Ryan Stinnett
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
David Baker
84bb0eb696 Remove random capital 2019-07-22 12:25:12 +01:00
David Baker
b664259e2d
more syntactic sugar 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-22 12:23:55 +01:00
David Baker
11ecb4ca54
s/terms /policies/ 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-22 12:23:28 +01:00
J. Ryan Stinnett
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
Bruno Windels
023130bb4b Redirect paste to composer when event target can't receive input 2019-07-19 17:49:04 +02:00
Bruno Windels
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
Bruno Windels
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
Bruno Windels
c713172a37 add proptypes 2019-07-19 16:34:50 +02:00
Bruno Windels
de1c4e0cfe better naming 2019-07-19 16:34:39 +02:00
Bruno Windels
f305d8ac08 Basic diff visualisation for plain text edits 2019-07-19 16:09:23 +02:00
Bruno Windels
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
Bruno Windels
77f5274cd8 don't focus composer on keydown with modifier 
this breaks shortcuts like copy, ...
 2019-07-19 09:10:20 +02:00
Bruno Windels
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
RiotRobot
03151418af Merge branch 'master' into develop 2019-07-18 15:51:33 +01:00
RiotRobot
3c0c64af8e v1.4.0 2019-07-18 15:50:46 +01:00
RiotRobot
8b0e36e884 Prepare changelog for v1.4.0 2019-07-18 15:50:45 +01:00
RiotRobot
480061bde3 Upgrade JS SDK to v2.2.0 2019-07-18 15:46:38 +01:00
J. Ryan Stinnett
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
Bruno Windels
1b06b9957a dont show remove button for original event in edit history 2019-07-18 14:40:05 +01:00
J. Ryan Stinnett
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
Bruno Windels
aca41fe80a dont show remove button for original event in edit history 2019-07-18 14:09:29 +02:00
J. Ryan Stinnett
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
J. Ryan Stinnett
537eb2c88f Remove reactions feature flag 
Fixes https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:23:12 +01:00
J. Ryan Stinnett
25351d552e Remove editing feature flag 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:23:12 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
599c49613f Remove reactions feature flag 
Fixes https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 17:00:36 +01:00
J. Ryan Stinnett
674f33917f Remove editing feature flag 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-17 16:56:15 +01:00
Bruno Windels
03f577bea9 use keydown here, as its a div element 2019-07-17 17:23:19 +02:00
Bruno Windels
50c88279a0 remove non-existing keypress handler 2019-07-17 17:05:56 +02:00
Bruno Windels
4bde0c08ad make sure we don't break any A or BUTTON keyboard handling 2019-07-17 16:53:12 +02:00
Bruno Windels
10a74696b3 hack around React having its own bubbling phase 2019-07-17 16:50:05 +02:00
J. Ryan Stinnett
b8aae63c83
Merge pull request #3229 from matrix-org/jryans/enable-reactions-edits-default 
Enable reactions and edits by default
 2019-07-17 15:20:07 +01:00
J. Ryan Stinnett
88a0dbe2f1
Merge pull request #3232 from matrix-org/jryans/v1.4.0/enable-reactions-edits-default 
Enable reactions and edits by default
 2019-07-17 15:19:08 +01:00
J. Ryan Stinnett
19b3b41ad6 Continue to next config level after device for features 
This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
 2019-07-17 15:16:10 +01:00
J. Ryan Stinnett
db560989da Enable reactions and edits by default 
This enables reactions and edits by default, assuming you don't have any local
device settings that would disable them.

Fixes https://github.com/vector-im/riot-web/issues/10281
 2019-07-17 15:16:10 +01:00
J. Ryan Stinnett
470f9b7704
Merge pull request #3231 from matrix-org/jryans/v1.4.0/tooltip-safe-area-alt 
Improve interactive tooltip safe mousing area
 2019-07-17 15:04:30 +01:00
J. Ryan Stinnett
e3d849e993 Improve interactive tooltip safe mousing area 
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
 2019-07-17 15:03:35 +01:00
J. Ryan Stinnett
3f760be540
Merge pull request #3230 from matrix-org/jryans/v1.4.0/action-bar-safe-area 
Add a previous event safe area around action bar
 2019-07-17 14:58:24 +01:00
J. Ryan Stinnett
2be9696a27 Add a previous event safe area around action bar 
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
 2019-07-17 14:57:42 +01:00