f42d619e7d
Missing comma
2016-08-11 12:30:37 +01:00
806477dcce
s/then/done/
2016-08-11 10:08:14 +01:00
a58a6275e5
Just use _canceled
...
Instead of both that and _unmounted
2016-08-11 10:06:22 +01:00
cab95f43ff
Show cancel button whilst inviting is in progress
...
And make it actually cancel the process.
2016-08-10 18:58:36 +01:00
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
fa498eb8c6
Comment typo
2016-08-10 18:37:21 +01:00
6b3b2e30fe
Don't reset completionStates
...
We now set them in the constructor
2016-08-10 18:36:33 +01:00
b9f0b72ae1
Missing proptypes
2016-08-10 18:35:59 +01:00
020e4e14df
Factor out single-invite
2016-08-10 18:32:42 +01:00
4a6a9bd95b
Remove redundant setState
...
Duplicated in `finally`
2016-08-10 18:28:20 +01:00
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
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
26c7c9e994
Make SessionLoader a function
...
There's no point in it being a React component.
2016-08-10 11:36:26 +01:00
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
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
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
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
5e358b8cf6
Add comment
2016-08-05 17:18:45 +01:00
f8d02c1551
pr feedback
2016-08-05 16:36:35 +01:00
e8ee5c2f96
Add config to hide the labs section
2016-08-05 16:13:06 +01:00
98e89d4293
Merge pull request #392 from matrix-org/dbkr/scalar
...
Dbkr/scalar
2016-08-05 15:43:57 +01:00
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
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
e8dbf978c3
Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
...
Refactor UI error effects
2016-08-05 12:34:56 +01:00
d0158f5812
fix merge conflict
2016-08-04 23:45:28 +01:00
cf70f1731e
hide integration management behind labs checkbox
2016-08-04 23:26:27 +01:00
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
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
5305cb6785
Copy change to better describe the function
2016-08-04 16:55:52 +01:00
990da61a61
Fixed regression of click propogation
2016-08-04 16:25:09 +01:00
d204b043e5
Changed state from mute to mentions only
2016-08-04 16:17:21 +01:00
0351ab0a3d
Merge pull request #381 from matrix-org/dbkr/deactivate_account
...
Implement account deactivation
2016-08-04 15:38:29 +01:00
90e5ab2ca3
merge in develop
2016-08-04 13:39:47 +01:00
f7fda68e26
Use p tags instead of brs
2016-08-04 10:53:07 +01:00
c017e8dcf4
Initialise _passwordField & delete stale comment
2016-08-04 10:51:31 +01:00
e144da75e3
Comment onLoggedOut & consistent comment style
2016-08-04 10:49:34 +01:00
e1fea24fd6
Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
...
Don't leave isRoomPublished as undefined
2016-08-04 10:42:34 +01:00
24cc4f52bf
Downgrade emojione to 2.2.3
...
... because @aviraldg says > 2.2.3 is broken :/
2016-08-03 21:36:52 +01:00
f4e40696bc
Bump emojione to 2.2.3
...
Because @aviraldg says it's better.
2016-08-03 21:17:54 +01:00
6632322029
spell out that conference calling is hit and miss
2016-08-03 19:56:13 +01:00
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
afa46a855b
Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account
2016-08-03 17:52:35 +01:00
498ad7fa4c
Merge branch 'develop' into dbkr/deactivate_account
2016-08-03 17:52:18 +01:00
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
bb3a7725db
Shift loginIncorrect into state
...
and consequently make setErrorTextFromError into setStateFromError
2016-08-03 17:49:29 +01:00
476f69cbec
Unused ref
2016-08-03 17:38:13 +01:00
b32a19a0f1
Comments
2016-08-03 17:23:09 +01:00
0919e41469
Fix MatrixClientPeg.start()
...
Move import & use `this`
2016-08-03 16:45:23 +01:00
009c768b72
Comma fail
2016-08-03 16:41:22 +01:00
9bf45fb556
Add start wrapper in MatrixClientPeg
...
to handle the opts dictionary
2016-08-03 16:39:47 +01:00
David Baker