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
David Baker
b45da45457
Merge pull request #686 from matrix-org/luke/rts-enable-branded-urls
...
Enable branded URLs again by parsing the path client-side
2017-02-13 13:38:55 +00:00
Luke Barnard
75deb55844
Null check on teamName
2017-02-13 11:48:03 +00:00
Luke Barnard
4ac769168a
View /home on registered /w team
2017-02-10 17:17:58 +00:00
Luke Barnard
29f5e88f6a
Instead of sending userId, userEmail, send sid, client_secret
...
This has the benefit of being possible from the _second_ riot instance, which may not actually have the email of the user registering. With these parameters, the RTS can get the email and user ID itself.
(see https://github.com/matrix-org/riot-team-server/pull/15 )
2017-02-10 16:50:25 +00:00
David Baker
33fc4f7d8d
Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon
...
Use new method of getting team icon
2017-02-10 16:39:11 +00:00
Kegan Dougal
c46f282139
Comments
2017-02-10 16:19:39 +00:00
Kegan Dougal
f628ee2ef0
Merge branch 'develop' into kegan/indexeddb
2017-02-10 16:16:17 +00:00
Luke Barnard
bdd031eac2
Enable branded URLs again by parsing the path client-side
...
Use the first path segment to key off config.teamTokenMap, which contains a mapping to teamTokens. The client then behaves as before, keeping the path in the address bar constant with no redirects required.
2017-02-10 15:09:45 +00:00
Kegan Dougal
407bcf1bb9
Delete database on logout. DI a SyncAccumulator. Log uncaught errors
2017-02-10 14:22:54 +00:00
Luke Barnard
a5a43bcd93
Merge pull request #685 from matrix-org/luke/rts-session-team-token
...
Persist query parameter team token across refreshes
2017-02-10 13:58:03 +00:00
Luke Barnard
ec730056d8
Alter comment
2017-02-10 11:39:22 +00:00
Luke Barnard
bab6a0b84a
Persist query parameter team token across refreshes
2017-02-10 11:31:04 +00:00
David Baker
8bd7d90ca2
Merge pull request #684 from matrix-org/luke/rts-thread-teamToken
...
Thread teamToken through to LeftPanel for "Home" button
2017-02-10 10:42:59 +00:00
Luke Barnard
45f5b8b3a9
Thread teamToken through to LeftPanel for "Home" button
...
This means the riot-web will use the same teamToken used by sdk components. This includes cases where only the fragment query parameter has been provided.
Fixes matrix-org/riot-web#3185
2017-02-10 09:57:28 +00:00
Luke Barnard
69add8fd64
Actually use the RTS URL
2017-02-09 13:16:46 +00:00
David Baker
7ba9e27893
Merge pull request #682 from matrix-org/luke/fix-typing-notif
...
Fix typing notif and status bar
2017-02-09 10:46:37 +00:00
Luke Barnard
dd22e57a38
Merge pull request #681 from matrix-org/luke/rts-matrix-org
...
Consider emails ending in matrix.org as a uni email
2017-02-09 10:34:02 +00:00
Luke Barnard
103710728f
Do not show "+1 other"
...
Instead show a user name or avatar.
2017-02-09 10:30:06 +00:00
Luke Barnard
553054409f
Use (props,state) ordering of arguments
...
There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.
2017-02-09 10:01:59 +00:00
Luke Barnard
cc69e982a7
Use single state to set both avatars and typing notif
2017-02-09 10:01:51 +00:00
