OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,621 Commits
215 Branches
561 Tags
465 MiB
Commit Graph

2621 Commits (ca240b0b852a2e980bfc5d4b62ccb379e3cf2a9e)

Author SHA1 Message Date
Richard van der Hoff df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
Richard van der Hoff 5440fd7504 Fix tests 
MatrixClientPeg no longer has a replaceUsingUrls method, so don't try to stub
it out.
 2016-08-12 07:27:53 +01:00
Matthew Hodgson d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson 3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
wmwragg 434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +01:00
wmwragg 7713f0d587 refactoring out the direct message section 2016-08-11 17:32:39 +01:00
David Baker ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker 028c652f49 Prepare changelog for v0.6.4 2016-08-11 17:29:10 +01:00
David Baker e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +01:00
wmwragg cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:48:31 +01:00
wmwragg a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:47:19 +01:00
David Baker 109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style 
Only show Autocomplete if autocomplete is enabled
 2016-08-11 16:47:07 +01:00
wmwragg 4aea2caefc Initial pass at creating a direct message section 2016-08-11 16:45:19 +01:00
David Baker 7cb663d39d Only show Autocomplete if autocomplete is enabled 
It was just never used, but it has 1px top border which makes the top border on chat look too big
 2016-08-11 16:28:32 +01:00
Richard van der Hoff 55a28564b9 Add device_id to devices display 
(it turns out to be quite useful)
 2016-08-11 16:24:09 +01:00
Richard van der Hoff e32c325863 Don't use MatrixClientPeg for temporary clients 
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
 2016-08-11 16:23:03 +01:00
Matthew Hodgson 3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu 
Wmwragg/room tag menu
 2016-08-11 08:59:32 -05:00
David Baker 4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration 
Move guest registration into the login logic
 2016-08-11 13:13:51 +01:00
Richard van der Hoff e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01:00
David Baker 4780f9000d Merge pull request #403 from matrix-org/dbkr/multi_invite 
Better support for inviting multiple people
 2016-08-11 12:34:16 +01:00
David Baker f42d619e7d Missing comma 2016-08-11 12:30:37 +01:00
David Baker 5b71b28dcf Fix member info 2016-08-11 11:34:14 +01:00
David Baker 3b317eb15d Merge pull request #406 from matrix-org/rav/refactor_token_login 
Refactor login token
 2016-08-11 11:09:05 +01:00
Richard van der Hoff bbfb9291f8 Refactor login token 
move the logic for handling login tokens into Lifecycle.loadSession

This means it needs access to the (real) query parmeters, so it depends on
corresponding changes in vector-web.
 2016-08-11 11:02:52 +01:00
David Baker 6802db05bd Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login 
Use the current HS for guest login
 2016-08-11 10:32:37 +01:00
David Baker 46899a0086 Merge pull request #395 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:23:00 +01:00
David Baker 806477dcce s/then/done/ 2016-08-11 10:08:14 +01:00
David Baker a58a6275e5 Just use _canceled 
Instead of both that and _unmounted
 2016-08-11 10:06:22 +01:00
Aviral Dasgupta 4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +05:30
Richard van der Hoff 1fbddcf6af Use the current HS for guest login 
Make sure that we use the homeserver from localstorage for guest regsistration,
in preference to the default.

Also rename the parameters for loadSession
 2016-08-11 01:39:33 +01:00
Richard van der Hoff 5b9d395234 Yet another fix to session saving 
I've written tests this time, and everything.
 2016-08-11 00:58:48 +01:00
Richard van der Hoff a85259c2b7 Fix session persistence 
https://github.com/matrix-org/matrix-react-sdk/pull/404 messed this up
somewhat; hopefully this gets it right
 2016-08-10 23:52:09 +01:00
David Baker cab95f43ff Show cancel button whilst inviting is in progress 
And make it actually cancel the process.
 2016-08-10 18:58:36 +01:00
David Baker d6f7358f81 Make completionStates an object 
So that we can sensibly track the number completed by taking the length of it.
 2016-08-10 18:50:56 +01:00
David Baker fa498eb8c6 Comment typo 2016-08-10 18:37:21 +01:00
David Baker 6b3b2e30fe Don't reset completionStates 
We now set them in the constructor
 2016-08-10 18:36:33 +01:00
David Baker b9f0b72ae1 Missing proptypes 2016-08-10 18:35:59 +01:00
David Baker 020e4e14df Factor out single-invite 2016-08-10 18:32:42 +01:00
David Baker 4a6a9bd95b Remove redundant setState 
Duplicated in `finally`
 2016-08-10 18:28:20 +01:00
Richard van der Hoff bb3a0ff08a Merge pull request #404 from matrix-org/dbkr/fix_settings_persistence 
Fix settings resetting on refresh
 2016-08-10 18:19:18 +01:00
David Baker 92762eca74 Fix settings resetting on refresh 
Don't clear localstorage when replacing the client: we clear it when logging out so this is just redundant, and since we now use replaceClient to unpickle a session from localstorage, this was blowing away all our setting on every refresh.

Also Move all of the localstorage code to Lifecycle (except device ID but this will probably be generated on the server soon anyway). We previously cleared localstorage on logout in Lifecycle so persist the session in Lifecycle.setLoggedIn() to be symmetrical.
 2016-08-10 18:04:22 +01:00
David Baker 54b3638a85 Better support for inviting multiple people 
Pasting a list of addresses into the box will now pop up a dialog to confirm and show you the success / failure state of each address. It will also not die if it gets rate limited.

Fixes https://github.com/vector-im/vector-web/issues/1713
 2016-08-10 17:11:49 +01:00
wmwragg 6d1eebe6f2 Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly 2016-08-10 17:01:06 +01:00
wmwragg e2d3631e7c Menu colour now changeable, and leave room item hooked up 2016-08-10 16:34:49 +01:00
David Baker f08519a496 Merge pull request #401 from matrix-org/rav/avoid_login_for_guest 
Avoid flashing up login screen during guest registration
 2016-08-10 15:38:34 +01:00
David Baker 839b985289 Merge pull request #400 from matrix-org/rav/cancel_rate_limited_funcs 
Cancel calls to rate-limited funcs on unmount
 2016-08-10 15:37:02 +01:00
wmwragg 667264420c hover state elements for the room tag menu, allong with CSS class updates 2016-08-10 14:46:05 +01:00
Richard van der Hoff 68f8db3834 Avoid flashing up login screen during guest registration 
Fix a bug where we would flash up the login screen during guest registration if
you followed a room link.
 2016-08-10 14:34:44 +01:00
Richard van der Hoff 8fe470bce1 Cancel calls to rate-limited funcs on unmount 
The tests were throwing up warnings about state being accessed, and null
MatrixClients being called, after component unmount.
 2016-08-10 13:39:47 +01:00
David Baker 6aa5e5a493 Merge pull request #399 from matrix-org/rav/refactor_session_rehydration 
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
 2016-08-10 12:56:01 +01:00