nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
63,449 Commits 258 Branches 582 Tags
langleyd/roomListLoadingState
Commit Graph

41210 Commits

Author SHA1 Message Date
David Baker
43e3662e60 Merge pull request #1935 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:22:46 +01:00
Aviral Dasgupta
19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
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
c2cb4dff4c Support for refactored login token handling 
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.

Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
 2016-08-11 01:55:51 +01:00
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
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
wmwragg
28343aaa33 Aignment tweak for the room tag menu so the icons better align 2016-08-10 17:44:49 +01:00
David Baker
3f615c6664 Basic CSS for multi-invite dialog 2016-08-10 17:12:20 +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
804b17fbf1 Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically 2016-08-10 17:00:06 +01:00
wmwragg
9798e14733 Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes 2016-08-10 16:35:22 +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
wmwragg
f8fa19ed47 Room tag menu dohickey on the avatar on hover 2016-08-10 15:04: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
wmwragg
ff13782ab5 Added set icons 2016-08-10 12:06:03 +01:00
Richard van der Hoff
3922f6a1b7 Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader 
This means that we don't create a spurious MatrixClient which is thrown away by
the SessionLoader (whilst still ensuring that the rehydrated matrixclient
follows the same code path as matrixclients created at other points in the
session load process).
 2016-08-10 11:59:24 +01:00
David Baker
b7b0991ae9 Don't show integrations header if setting not on 
If the labs setting for integrations was disableds, we still showed
the header for the integrations section but with nothing underneath
it.
 2016-08-10 11:51:51 +01:00
wmwragg
b1dd7efed8 Fixed weird lightening of fonts on a refresh of page on safari 2016-08-10 11:51:23 +01:00
David Baker
e0f71977b4 Merge pull request #397 from matrix-org/rav/factor_out_sessionloader 
Start to factor out session-loading magic
 2016-08-10 11:40:58 +01:00
wmwragg
699a58e0b3 Fix for historic and new undefined order issues 2016-08-10 11:39:10 +01:00
Richard van der Hoff
26c7c9e994 Make SessionLoader a function 
There's no point in it being a React component.
 2016-08-10 11:36:26 +01:00
David Baker
13a4bfa8fe Merge pull request #396 from matrix-org/rav/fix_react_warning 
Hack around a react warning
 2016-08-10 10:09:18 +01:00
Richard van der Hoff
afc889ff4d Some tests of the application load process 2016-08-10 00:15:04 +01:00
Richard van der Hoff
24841cc5c4 Start to factor out session-loading magic 
Take some of the magic out of MatrixChat.componentDidMount() into a new
component.

Also delete the MatrixChat test. It wasn't really doing much, is broken by the
change, and I am replacing it with (better) app-level tests in the vector
project.
 2016-08-10 00:05:44 +01:00
Richard van der Hoff
a1d3db76e5 Hack around a react warning 
when login completes, we replace the whole state, which means we unset
collapse_lhs, which then leads to complaints from the RoomList.

I think the 'default view' for MatrixChat ought to be factored out to another
component, which could manage collapse_lhs properly; but for now, hack around
it.
 2016-08-09 23:57:36 +01:00
Aviral Dasgupta
1b414cad18 Add max-width to emoji completions. 2016-08-10 00:52:55 +05:30
Aviral Dasgupta
09e8a45cde Add EmojiText component for emoji replacement. 2016-08-10 00:31:51 +05:30
wmwragg
1c812b340d Initial pass at handling room tags that don't have an order element, but need one manual ordering 2016-08-09 19:20:27 +01:00
Aviral Dasgupta
dbbea63227 Various fixes and improvements to emojification. 
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
 2016-08-09 22:09:28 +05:30
Aviral Dasgupta
bd9f5d3e06 Various fixes and improvements to emojification. 
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
 2016-08-09 21:44:09 +05:30
wmwragg
cf8164bcc3 New icons 2016-08-08 18:11:18 +01:00
wmwragg
33612b7076 New dekete icon and ignoring olm.js 2016-08-08 17:11:08 +01:00
wmwragg
75e1277961 Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now 2016-08-08 16:55:27 +01:00
wmwragg
5a97786cc6 Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now 2016-08-08 16:55:02 +01:00