David Baker
4753552ddc
Merge pull request #706 from matrix-org/luke/fix-team-token-referral-link
...
Make UserSettings use the right teamToken
2017-02-16 18:12:46 +00:00
David Baker
b13e6ca022
Merge pull request #705 from matrix-org/luke/rts-default-goto-directory
...
If the home page is somehow accessed, goto directory
2017-02-16 18:10:56 +00:00
Luke Barnard
406c34b715
Make UserSettings use the right teamToken
...
This threads the correct teamToken through to UserSettings for generating the referral section.
2017-02-16 18:00:52 +00:00
Luke Barnard
9d2bb70823
If the home page is somehow accessed, goto directory
...
For example, if someone ends up on /home somehow, just redirect to the directory instead of displaying a very awkward "File not found" plain text in the home page iFrame.
2017-02-16 17:03:22 +00:00
Kegan Dougal
53f3b5780e
Merge branch 'develop' into kegan/indexeddb
2017-02-16 16:10:23 +00:00
Luke Barnard
6945e7c154
Merge pull request #699 from matrix-org/luke/fix-avatar-initials
...
Display avatar initials in typing notifications
2017-02-16 14:06:05 +00:00
David Baker
fe4a28b59a
Merge pull request #703 from aviraldg/fix-no-invalid-this
...
fix eslint's no-invalid-this rule for class properties
2017-02-16 13:26:31 +00:00
Kegan Dougal
f07da44aa5
Don't handle logs db: It needs to close its connections first
2017-02-16 12:42:45 +00:00
Aviral Dasgupta
0e66b370d4
fix eslint's no-invalid-this rule for class properties
2017-02-16 16:49:00 +05:30
David Baker
1f77534b32
Merge pull request #701 from matrix-org/luke/rts-allow-non-referrals
...
If a referrer hasn't been specified, use empty string
2017-02-16 10:42:27 +00:00
Luke Barnard
74487c655d
If a referrer hasn't been specified, use empty string
...
This is interpretted by the RTS as a non-referred team member who still needs the team token to access their welcome page etc.
2017-02-16 09:22:44 +00:00
Aviral Dasgupta
ebe7ec4000
Rename RTE labs option to "New Composer & Autocomplete"
...
As per confusion around https://riot.im/develop/#/room/!DdJkzRliezrwpNebLk:matrix.org/$1487091505948TmtGn:t2l.io
2017-02-16 02:20:34 +05:30
Richard van der Hoff
5769213647
Merge pull request #700 from matrix-org/rav/no_logout_on_localstorage_fail
...
Don't force-logout the user if reading localstorage fails
2017-02-15 19:59:30 +00:00
Richard van der Hoff
bdb8f9d052
Don't force-logout the user if reading localstorage fails
...
Give them a modal dialog to give them a chance to abort.
2017-02-15 19:33:39 +00:00
David Baker
8698d40d3c
Fix docs & add MatrixClient check
...
Addresses PR feedback without breaking RoomSettings
2017-02-15 19:01:00 +00:00
David Baker
a5a056292d
Revert c082827fc7
...
Revert the WithMatrixClient change: RoomView calls methods on
the RoomSettings component and this breaks when RoomSettings is
wrapped in a WithMatrixClient.
2017-02-15 18:58:59 +00:00
David Baker
c082827fc7
Fix docs & use WithMatrixClient
2017-02-15 17:58:50 +00:00
Luke Barnard
8067bb627f
Display avatar initials in typing notifications
...
It seems they don't overlap hawkwawdly anymore, so this displays them always.
Fixes https://github.com/vector-im/riot-web/issues/3084
2017-02-15 16:29:08 +00:00
Richard van der Hoff
42bb26925d
Merge branch 'develop' into dbkr/add_unban_button
2017-02-15 13:19:22 +00:00
Richard van der Hoff
a5325ee14a
Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons
...
Convert some missed buttons to AccessibleButton
2017-02-15 13:10:14 +00:00
David Baker
431e7a875d
Copyright
2017-02-14 18:10:40 +00:00
David Baker
1e1ae5c950
Merge pull request #696 from matrix-org/dbkr/ban_becomes_unban
...
Make ban either ban or unban
2017-02-14 18:00:15 +00:00
David Baker
87516fb950
Add a button to un-ban users in RoomSettings
...
https://github.com/vector-im/riot-web/issues/3091
2017-02-14 17:54:57 +00:00
David Baker
e1cb34e255
Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons
2017-02-14 17:45:30 +00:00
David Baker
973b92b8f6
Merge pull request #694 from matrix-org/dbkr/confirm_ban
...
Add confirmation dialog to kick/ban buttons
2017-02-14 17:31:51 +00:00
David Baker
6fc70415cb
s/onBan/onBanOrUnban/
2017-02-14 17:29:40 +00:00
Luke Barnard
3d4a831624
Merge pull request #695 from matrix-org/luke/fix-scalar-popup
...
Fix typo with Scalar popup
2017-02-14 17:13:55 +00:00
David Baker
f38b2dee78
Convert some missed buttons to AccessibleButton
...
In RoomSettings
2017-02-14 17:06:16 +00:00
David Baker
6663f5bff0
Remove commented stuff
...
That I've now broken such that it wouldnt work if it were
uncommented
2017-02-14 16:12:04 +00:00
David Baker
ec0ce76d87
Clarify docs
2017-02-14 16:09:02 +00:00
David Baker
a1c990a2ea
Make ban either ban or unban
...
depending on whether the user is banned already
Mostly gives some feedback that the ban has actually taken effect.
2017-02-14 16:03:30 +00:00
Luke Barnard
0303a42fc7
Fix typo with Scalar popup
2017-02-14 15:35:14 +00:00
David Baker
5e232d8500
Argh, ES6 import syntax
2017-02-14 14:33:21 +00:00
David Baker
ff61b76bf7
Fix imports
2017-02-14 13:58:29 +00:00
David Baker
689972f023
Copyright
2017-02-14 13:57:22 +00:00
David Baker
8001c0b16b
Add confirmation dialog to kick/ban buttons
...
Add a specific dialog used for confirming member actions.
Also remove onFinished from MemberInfo which did absolutely
nothing.
2017-02-14 13:40:19 +00:00
Luke Barnard
76f80e9873
Merge pull request #693 from matrix-org/luke/fix-team-token-undefined
...
Treat the literal team token string "undefined" as undefined
2017-02-14 13:29:00 +00:00
Luke Barnard
1b8e93d4f2
Treat the literal team token string "undefined" as undefined
...
Some users appear to have gotten team tokens into their local storage. This fix will treat the literal string "undefined" as undefined.
2017-02-14 12:56:29 +00:00
Luke Barnard
0e08646d01
Merge pull request #692 from matrix-org/luke/fix-missing-sid
...
Store retrieved sid in the signupInstance of EmailIdentityStage
2017-02-14 11:35:12 +00:00
Luke Barnard
6996291f0c
Store retrieved sid in the signupInstance of EmailIdentityStage
...
When registeration is complete, the RTS needs the sid, which was previously only sent to the HS. This update will also store it in the signupInstance so that it can be sent to the RTS.
2017-02-14 11:00:40 +00:00
David Baker
17b08aedfc
Merge pull request #691 from matrix-org/dbkr/interactive_auth_nondialog
...
Split out InterActiveAuthDialog
2017-02-14 10:55:12 +00:00
David Baker
43a740df15
Add busy param to docs
2017-02-14 10:34:43 +00:00
David Baker
ba3e62e395
Remove old docs
2017-02-14 10:31:56 +00:00
David Baker
18cba1fe45
Merge pull request #689 from matrix-org/luke/rts-set-team-token-view-home
...
View /home on registered /w team
2017-02-14 10:21:23 +00:00
David Baker
36d126f3a9
PR feedback
2017-02-13 19:09:43 +00:00
David Baker
8fc3104507
Replace submit button with a spinner when busy
...
and update test accordingly
2017-02-13 18:52:33 +00:00
David Baker
77b226631a
Copyright
2017-02-13 16:15:00 +00:00
David Baker
79d9deb339
Split out InterActiveAuthDialog
...
Into a component that does Interactive Auth and a dialog that
wraps it, so we can do interactive auth not necessarily in a
dialog.
As a side effect:
* Put the buttons for each auth stage in the stage itself.
Some stages don't have submit buttons (and it's very possible
other stages may have other buttons entirely, like 'resend')
so it makes more sense for the buttons to live in the stage
components themselves. Plus it saves the slightly evil
calling-functions-on-react-children thing we were doing (and
indeed extending that to show the submit button at all).
* Give all BaseDialogs a cross in the top right to cancel. They
were all dismissable by clicking outside or pressing esc, so
this adds a more visually obvious way of dismissing them. Plus,
it means our InteractiveAuthDialog can have a way of canceling
the whole operation separate from buttons for the individual
stages.
2017-02-13 16:03:21 +00:00
Luke Barnard
16e3365240
Use a callback prop instead of window.
2017-02-13 14:36:35 +00:00
Luke Barnard
a21e71f59d
Merge pull request #688 from matrix-org/luke/rts-use-sid-client-secret
...
Instead of sending userId, userEmail, send sid, client_secret
2017-02-13 13:49:23 +00:00
