Commit graph

7868 commits

Author SHA1 Message Date
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
84bb0eb696 Remove random capital 2019-07-22 12:25:12 +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
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
Bruno Windels
aca41fe80a dont show remove button for original event in edit history 2019-07-18 14:09:29 +02: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
fc8cdc5661 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 14:11:27 +01:00
Bruno Windels
3d4cd8aa1c local echos should always be ignored (for both RM and RR),so remove flag
pending events won't be in liveEvents (where we look) anyway
2019-07-17 10:19:44 +02:00
Bruno Windels
c94715150d as both RM and RR move past invisible events, remove the flag 2019-07-17 10:18:51 +02:00
Bruno Windels
741ae9957b also put read marker past (like RR) invisible events 2019-07-17 10:15:09 +02:00
Michael Telatynski
df26840d9e ChatCreateOrReuse show only rooms both you and the other party still in
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-15 23:07:59 +01:00
Travis Ralston
2471f92331
Merge pull request #3218 from matrix-org/travis/check-when-dead
Check for liveliness on submission when the server was previously dead
2019-07-15 14:46:55 -06:00
Travis Ralston
2bc0e8e151 Don't rely on React being fast 2019-07-15 10:51:08 -06:00
Bruno Windels
57abbc4273 remove unnessary manual focussing of composer
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
2019-07-15 18:21:10 +02:00
Bruno Windels
4adea67eb3 focus the composer in the body keydown handler if not other shortcuts apply
this allows the user to start typing a message even if the composer is not focused.
2019-07-15 18:12:45 +02:00
Travis Ralston
d08cb70fa6
Merge pull request #3219 from matrix-org/travis/fix-delay
Fix autocomplete delay text field not accepting text
2019-07-15 09:30:33 -06:00
Travis Ralston
3fcbd46939
Merge pull request #3220 from matrix-org/travis/kick-reason
Don't show a reason if there's no reason for a kick/ban
2019-07-15 09:30:19 -06:00
Bruno Windels
7e25e1b2fc remove unneeded else 2019-07-15 14:02:41 +02:00
Bruno Windels
034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels
8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston
31339aa11f Don't show a reason if there's no reason for a kick/ban
Fixes https://github.com/vector-im/riot-web/issues/9677
2019-07-14 23:31:38 -06:00
Travis Ralston
345dbce6e4 Fix autocomplete delay text field not accepting text
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.

Fixes https://github.com/vector-im/riot-web/issues/9907
2019-07-14 23:28:23 -06:00
Travis Ralston
c6a18b11f0 Check for liveliness on submission when the server was previously dead
Fixes https://github.com/vector-im/riot-web/issues/10017

Specifically the `return` at the end of the diff fixes the problem, but it seems worthwhile to check for liveliness when we know the server has been dead in previous attempts.
2019-07-14 23:23:48 -06:00
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin
Autojoin rooms when clicking the tombstone
2019-07-12 08:14:42 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia
Send the correct UIA alongside the wrong UIA for backwards comaptibility
2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag
Remove unused identityEnabled property from ValidatedServerConfig
2019-07-12 08:11:55 -06:00
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy
Remove misleading text about admins logging people out from soft logout
2019-07-12 12:32:24 +01:00
J. Ryan Stinnett
b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Bruno Windels
7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste
Prevent autocomplete on paste, and verserev-ing text before and after :
2019-07-12 08:25:06 +00:00
Travis Ralston
7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig
See https://github.com/vector-im/riot-web/issues/10229
2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b Close settings after deactivating
Fixes https://github.com/vector-im/riot-web/issues/9566
2019-07-11 14:54:49 -06:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility
Fixes https://github.com/vector-im/riot-web/issues/10312
2019-07-11 14:28:10 -06:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Bruno Windels
507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston
5f9a123a80 Require an issue URL (or notes) on rageshakes
Fixes https://github.com/vector-im/riot-web/issues/8155
2019-07-11 09:14:31 -06:00
Travis Ralston
ed2f88fd79 Autojoin rooms when clicking the tombstone
Fixes https://github.com/vector-im/riot-web/issues/10299
2019-07-11 08:39:41 -06:00
David Baker
99d1ed5efe s/terms/policies/ 2019-07-11 14:48:18 +01:00
David Baker
18dde859af
s/terms/policies/
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-11 14:46:20 +01:00
Michael Telatynski
56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick
Show anything other than ban/invite -> leave as a kick
2019-07-11 11:33:53 +01:00
David Baker
f77e7fc3e8 Use m.accepted_terms account data
To remember what policies the user has agreed to
2019-07-11 10:53:45 +01:00
J. Ryan Stinnett
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files
Run stylelint on all SCSS files
2019-07-11 09:38:18 +01:00
Bruno Windels
dd12824a52
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history
Show original event in edit history
2019-07-11 08:10:01 +00:00
Travis Ralston
2a54fe321f Use the state variable for the password when deactivating
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.

Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
2019-07-10 11:26:09 -06:00
J. Ryan Stinnett
38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
David Baker
0316aa11b7 Rest of terms/policies renaming 2019-07-10 15:12:05 +01:00
Travis Ralston
ce11eff1b8 Simplify parameter check 2019-07-10 08:01:32 -06:00
David Baker
8de5c348f3 focus is a bit silly if its starts disabled 2019-07-10 14:33:20 +01:00
David Baker
06c0bce053 These can be pure components 2019-07-10 14:32:37 +01:00
David Baker
72b1ad37a2
Remove random space
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:30:48 +01:00
David Baker
fcf82efc7c
Bots isn't a proper noun so no real reason for it to get a capital
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:17:42 +01:00
David Baker
189dd4c7b1 SERVICE_TYPES 2019-07-10 12:08:26 +01:00
Michael Telatynski
8d4356a5b9 Show anything other than ban/invite -> leave as a kick
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-10 08:57:00 +01:00
Travis Ralston
2ca6633fda Update copy as per design 2019-07-09 23:55:20 -06:00
Travis Ralston
041379fa3c Don't refuse the soft logout page if the user is soft logged out 2019-07-09 23:44:14 -06:00
Travis Ralston
1eb60ef1c4 Support SSO for rehydrating a soft-logged-out session.
Fixes https://github.com/vector-im/riot-web/issues/10238
2019-07-09 20:16:44 -06:00
David Baker
83f697a9a2 lint 2019-07-09 19:01:22 +01:00
David Baker
d4af8d4993 Use showIntegrationsManager in other places 2019-07-09 18:56:39 +01:00
David Baker
54aaabac74 Initial support for ToS dialogs for IS/IM
as per MSC2140
2019-07-09 18:51:56 +01:00
Travis Ralston
4b1d78e04d Merge branch 'develop' into travis/soft-logout-design 2019-07-09 11:35:49 -06:00
Travis Ralston
a33e5f1918
Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs
Fix React crash when using a non-default homeserver on soft logout
2019-07-09 11:32:31 -06:00
Travis Ralston
370fa27de3
Merge pull request #3187 from matrix-org/travis/soft-logout-keys
Change soft logout rehydrate text if there's pending key backups
2019-07-09 11:32:17 -06:00
Travis Ralston
7b869f2824
Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate
Ask for the user's password to rehydrate their soft logged out session
2019-07-09 11:31:51 -06:00
Bruno Windels
11718a982a use originalEvent if present and append it to list 2019-07-09 17:54:59 +02:00
Bruno Windels
31723e9e5b
Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions
Don't try to call bodyToHtml with an empty content
2019-07-09 15:05:03 +00:00
Bruno Windels
7ab665bf31
Merge pull request #3193 from matrix-org/bwindels/replace-server-date
Take server-side aggregation into account for timestamp on (edited) tooltip
2019-07-09 15:03:21 +00:00
Bruno Windels
f03187190e Don't try to call bodyToHtml with an empty content
with the stripReply flag, this crashes.
2019-07-09 15:00:26 +02:00
Michael Telatynski
349afb13f3
Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches
Fix some React errors
2019-07-09 10:59:29 +01:00
Bruno Windels
58d7ed02b7 use method that also takes server aggregations into account for tooltip date 2019-07-09 11:31:29 +02:00
Travis Ralston
ab63e8bd04 Remove backwards compat function 2019-07-08 11:55:00 -06:00
Travis Ralston
d2ab0a5ca7 Move key backup init to componentDidMount 2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-08 11:52:58 -06:00
Travis Ralston
c3383e9315 Move _initLogin to componentDidMount 2019-07-08 11:51:22 -06:00
Bruno Windels
f6e71b2335 turn flag into options object 2019-07-08 16:55:56 +02:00
Bruno Windels
e601037cd2 don't show reply fallback in edit history 2019-07-08 15:32:38 +02:00
Bruno Windels
888e4d1ec2 preserve reply fallback when editing 2019-07-08 15:25:44 +02:00
Michael Telatynski
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl
Don't show Remove button in ImageView if can't redact, delint ImageView
2019-07-08 10:23:51 +01:00
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions
Edit history actions
2019-07-08 08:19:27 +00:00
Bruno Windels
1af2ca6b36 constistent jsx bracket and indent styling 2019-07-08 10:12:26 +02:00
Bruno Windels
cf11a3758f set analyticsInfo for dialogs 2019-07-08 10:12:04 +02:00
Michael Telatynski
c2905bd33b make things a tad saner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:16:01 +01:00
Michael Telatynski
89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_*
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 10:42:14 +01:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying
Don't allow editing via up-arrow when Replying
2019-07-06 08:53:22 +01:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit
If oldContent matches newContent, skip sending the edit
2019-07-06 08:52:58 +01:00