Commit Graph

3346 Commits

Author SHA1 Message Date
Bruno Windels 13a3cf3afe consistent naming
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-09-11 17:58:14 +01:00
Bruno Windels cf8ca176e2 remove labels and add join/view & preview button instead in directory 2019-09-11 17:58:14 +01:00
Bruno Windels ea7cbbc0ee keep filter field expanded if it has text in it 2019-09-11 17:57:40 +01:00
Bruno Windels b9421e4269 make add room button go to create room dialog instead of room directory 2019-09-11 17:57:40 +01:00
Bruno Windels 31682b61ce make filter feed transparent when not focussed 2019-09-11 17:57:40 +01:00
Bruno Windels b328fcb7e3 show shorter placeholder for filter feed when not focused 2019-09-11 17:57:40 +01:00
Bruno Windels 0fe31f843a hide explore button when focusing filter field 2019-09-11 17:57:40 +01:00
Bruno Windels 4ffa8c7b4a add explore button next to filter field 2019-09-11 17:57:40 +01:00
Bruno Windels b531bb58ca Let user know their account has been deactivated upon trying to login 2019-08-05 13:55:55 +01:00
David Baker da49dd4409 Don't load guest sessions on post-registration login link
If guest access was enabled, clicking the login link on the 'registration
completed' page would just load the guest account you had before registering.

Fixes https://github.com/vector-im/riot-web/issues/10482
2019-08-05 11:16:07 +01:00
Michael Telatynski 201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types
# Conflicts:
#	test/components/structures/MessagePanel-test.js
2019-07-31 12:21:00 +01:00
Michael Telatynski 1087e04bb5 Replace React.PropTypes with usage of the prop-types package
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-31 12:19:29 +01:00
Michael Telatynski 4517fea496 Introduce RoomContext for sharing state between RoomView and children
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-31 00:47:38 +01: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 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
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 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
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 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
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
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
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 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 000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston ce11eff1b8 Simplify parameter check 2019-07-10 08:01:32 -06: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
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 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
Travis Ralston ae79ce97f3 Dress up the soft logout page to look like the design
Fixes https://github.com/vector-im/riot-web/issues/10262

Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
2019-07-05 15:05:31 -06:00
Travis Ralston ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 2019-07-05 15:03:24 -06:00
Travis Ralston 1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
2019-07-05 14:35:21 -06:00
Travis Ralston 55b4ef2169 Change soft logout rehydrate text if there's pending key backups
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
2019-07-05 13:52:14 -06:00
Travis Ralston d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-05 13:41:04 -06:00