OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,560 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

3560 Commits (5ef61b7c35f0ca55695b09e5a5f1892bbcd22af8)

Author SHA1 Message Date
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 8d3876c7d0 MELS: either expanded or summary, not both 
Fixes vector-im/riot-web#3097
 2017-02-09 15:14:16 +00:00
Luke Barnard 69add8fd64 Actually use the RTS URL 2017-02-09 13:16:46 +00:00
Luke Barnard ae03244e6e Merge branch 'develop' into luke/feature-css-msg-colors 2017-02-09 13:14:15 +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
Luke Barnard 40658494b4 Consider emails ending in matrix.org as a uni email 
For the purposes of testing (and having a team page)
 2017-02-09 09:29:55 +00:00
Luke Barnard 747c0c44a6 Use new method of getting team icon 
This was necessary because the team token may not be known when registering, but domain is. Storing the icon under the "common" directory is the chosen solution to this.
 2017-02-09 09:24:46 +00:00
Matthew Hodgson ad2710ec5d fix CSS for import/export buttons 2017-02-09 02:00:58 +00:00
Matthew Hodgson ea50acfc87 fix dark theme for uploadbar 2017-02-09 01:26:53 +00:00
Matthew Hodgson 231997dd63 unbreak /markdown off 2017-02-09 01:18:09 +00:00
Luke Barnard 449519dc32 Merge pull request #679 from matrix-org/luke/rts-email-verif-referrer 
Set referrer qp in nextLink
 2017-02-08 22:05:49 +00:00
David Baker f1288d85ba Merge pull request #678 from matrix-org/luke/rts-fix-undefined-team-token 
Do not set team_token if not returned by RTS on login
 2017-02-08 18:08:12 +00:00
Luke Barnard c2d5b72d68 Set referrer qp in nextLink 
This is so that when the verification link is clicked from an email, the referrer is set on the new instance of riot when /rts/register is hit
 2017-02-08 17:58:40 +00:00
Luke Barnard 260cb62438 Do not set team_token if not returned by RTS on login 2017-02-08 16:49:33 +00:00
David Baker fe17e2452b Merge pull request #676 from matrix-org/luke/rts-team-token-login 
Get team_token from the RTS on login
 2017-02-08 10:54:24 +00:00
Matthew Hodgson 8fea4c27cb fix NPE 2017-02-07 22:00:56 +00:00
Luke Barnard 3d30db81e0 Only init RTS if configured correctly 2017-02-07 15:24:57 +00:00
Luke Barnard 3f9f59bb73 Import RtsClient at top 2017-02-07 15:23:23 +00:00
David Baker 96539a4054 Merge pull request #666 from matrix-org/luke/rts-welcome-pages 
RTS Welcome Pages
 2017-02-07 13:42:47 +00:00
Luke Barnard d5f6ecdc49 Use teamToken, not config when doing screen fallback 2017-02-07 13:23:58 +00:00
Luke Barnard c93b6c3c34 Style, fixes 2017-02-07 13:15:40 +00:00
Luke Barnard af19ea8bb7 Document login API 2017-02-07 12:01:44 +00:00
David Baker c0d2fe19ef Merge pull request #677 from matrix-org/rav/logging_for_send_fail 
Logging to try to track down riot-web#3148
 2017-02-06 16:46:54 +00:00