sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
2,131 Commits 4 Branches 19 Tags
bbfb9291f8506487a5285e9ca57dd4f11287d2b2
Commit Graph
1291 Commits
Author SHA1 Message Date
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 BakerandGitHub 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 BakerandGitHub 46899a0086 Merge pull request #395 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:23:00 +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
David BakerandGitHub 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
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 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
David BakerandGitHub 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
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 BakerandGitHub 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 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 09e8a45cde Add EmojiText component for emoji replacement. 2016-08-10 00:31:51 +05:30
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
David BakerandGitHub 4b8ad3c102 Merge pull request #393 from matrix-org/dbkr/enable_labs 
Add config to hide the labs section
 2016-08-05 17:25:25 +01:00
David Baker 5e358b8cf6 Add comment 2016-08-05 17:18:45 +01:00
David Baker f8d02c1551 pr feedback 2016-08-05 16:36:35 +01:00
David Baker e8ee5c2f96 Add config to hide the labs section 2016-08-05 16:13:06 +01:00
David BakerandGitHub 98e89d4293 Merge pull request #392 from matrix-org/dbkr/scalar 
Dbkr/scalar
 2016-08-05 15:43:57 +01:00
Matthew HodgsonandGitHub 10aa201d33 Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix 
Wmwragg/mute mention state fix
 2016-08-05 14:44:27 +01:00
Richard van der HoffandGitHub ff02c21252 Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze 
Fix long freeze when opening 'historical' section
 2016-08-05 12:47:01 +01:00
Richard van der HoffandGitHub e8dbf978c3 Merge pull request #388 from matrix-org/dbkr/refactor_field_errors 
Refactor UI error effects
 2016-08-05 12:34:56 +01:00
Matthew Hodgson d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson cf70f1731e hide integration management behind labs checkbox 2016-08-04 23:26:27 +01:00
David Baker 9d958ab508 Fix long freeze when opening 'historical' section 
By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events.

Fixes https://github.com/vector-im/vector-web/issues/1845
 2016-08-04 17:54:00 +01:00
David Baker 1f2b023885 Make sure error message never lies 
Make sure we don't say 'login incorrect' unless the user is actually trying to log in
 2016-08-04 17:37:07 +01:00
wmwragg 5305cb6785 Copy change to better describe the function 2016-08-04 16:55:52 +01:00
wmwragg 990da61a61 Fixed regression of click propogation 2016-08-04 16:25:09 +01:00
wmwragg d204b043e5 Changed state from mute to mentions only 2016-08-04 16:17:21 +01:00
Richard van der HoffandGitHub 0351ab0a3d Merge pull request #381 from matrix-org/dbkr/deactivate_account 
Implement account deactivation
 2016-08-04 15:38:29 +01:00
Matthew Hodgson 90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
David Baker f7fda68e26 Use p tags instead of brs 2016-08-04 10:53:07 +01:00
David Baker c017e8dcf4 Initialise _passwordField & delete stale comment 2016-08-04 10:51:31 +01:00
David Baker 2d936a2850 Don't leave isRoomPublished as undefined 
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
 2016-08-03 18:23:38 +01:00
David Baker 498ad7fa4c Merge branch 'develop' into dbkr/deactivate_account 2016-08-03 17:52:18 +01:00
David BakerandGitHub cbfb0ad998 Merge pull request #377 from matrix-org/dbkr/use_logout_api 
Call the logout API when we log out
 2016-08-03 17:51:42 +01:00
David Baker bb3a7725db Shift loginIncorrect into state 
and consequently make setErrorTextFromError into setStateFromError
 2016-08-03 17:49:29 +01:00
David Baker 476f69cbec Unused ref 2016-08-03 17:38:13 +01:00
David BakerandGitHub 1b39f02141 Merge pull request #335 from aviraldg/feature-composer-emoji 
feat: code cleanup & emoji replacement in composer
 2016-08-03 16:18:56 +01:00
David BakerandGitHub 3780d82f6f Merge pull request #386 from matrix-org/rav/default_to_device_id 
DevicesPanel: use device_id as a placeholder
 2016-08-03 16:12:46 +01:00
David Baker f469bbbb64 Refactor UI error effects 
And add error effects to the login page to be consistent with the registration page
 2016-08-03 15:59:17 +01:00
Richard van der HoffandGitHub 42f6703112 Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys 
MemberDeviceInfo: Use the device name, where available
 2016-08-03 15:26:37 +01:00
Matthew HodgsonandGitHub f95a11a9bf Merge pull request #369 from matrix-org/wmwragg/mention-state-menu 
Wmwragg/mention state menu
 2016-08-03 15:22:39 +01:00
wmwragg c1cfbd6b59 Corrected comment typo 2016-08-03 14:47:53 +01:00
Richard van der Hoff f4d41b7847 DevicesPanel: use device_id as a placeholder 
A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder.
 2016-08-03 14:19:54 +01:00
Richard van der Hoff 55f4d23625 MemberDeviceInfo: Use the device name, where available 
we now have device name for e2e devices: use it!
 2016-08-03 14:18:09 +01:00
wmwragg 8e19532e5a Hover state for badges, now only on the badges themselves 2016-08-03 14:09:10 +01:00
David BakerandGitHub efdcc6da98 Merge pull request #384 from aviraldg/fix-composer-up-down 
fix: allow up/down normally for no completions
 2016-08-03 13:55:13 +01:00