c4001b5c5d
Use else instead of two returns
2017-03-08 15:11:38 +00:00
eca82bdb42
Make sure the screen is set, otherwise ignore screenAfterLogin
2017-03-08 10:45:07 +00:00
06a05c351d
Decide on which screen to show after login in one place
...
This follows from a small amount of refactoring done when RTS was introduced. Instead of setting the screen after sync, do it only after login.
This requires as-yet-to-be-PRd riot-web changes.
This includes:
- initialScreenAfterLogin, which can be used to set the screen after login, and represents the screen that would be viewed if the window.location at the time of initialising Riot were routed.
- guestCreds are now part of state, because otherwise they don't cause the login/registration views to update when set.
- instead of worrying about races and using this._setPage, use a dispatch.
2017-03-08 10:25:54 +00:00
49c66d8645
Merge pull request #735 from matrix-org/luke/matrix-to-timestamp-permalink
...
Change timestamp permalinks to matrix.to
2017-03-06 11:07:50 +00:00
30eddf9fda
Merge pull request #734 from matrix-org/luke/fix-resend
...
Fix resend bar and "send anyway" in UDD
2017-03-06 11:06:52 +00:00
9f6a5d11ae
Merge pull request #737 from matrix-org/luke/fix-color-regex-strictness
...
Make COLOR_REGEX stricter
2017-03-03 17:49:12 +00:00
fa2cf41039
Make COLOR_REGEX stricter
2017-03-03 15:46:13 +00:00
62d9439530
Remove old import & pass through result
...
in InteractiveAuthDialog
2017-03-03 14:31:52 +00:00
1bdf213d67
Merge pull request #729 from matrix-org/dbkr/register_ui_auth
...
Port registration over to use InteractiveAuth
2017-03-03 13:37:41 +00:00
977b8a7379
Make UIAuth Dialog show an error
...
when auth fails
2017-03-03 12:08:26 +00:00
ab9aaa9174
Merge pull request #732 from matrix-org/luke/fuse-test
...
Test to see how fuse feels
2017-03-03 10:46:41 +00:00
923ea9c6aa
Change timestamp permalinks to matrix.to
2017-03-03 10:42:44 +00:00
8522231d4f
Revery unintentional change
...
to when teamToken was returned
2017-03-03 10:28:10 +00:00
b822bc66ee
Remove redundant null check
2017-03-03 10:22:02 +00:00
7be55ce65c
Merge pull request #733 from matrix-org/luke/display-name-blur-to-submit
...
Submit a new display name on blur of input field
2017-03-03 10:03:21 +00:00
4fff383de5
Fix resend bar and "send anyway" in UDD
2017-03-03 10:02:08 +00:00
6a007d01a1
Merge pull request #610 from matrix-org/luke/feature-css-msg-colors
...
Allow [bf]g colors for <font> style attrib
2017-03-03 08:35:32 +00:00
f4278b61ea
Update comment
2017-03-02 18:13:01 +00:00
1d5e47cd70
On cancel, blur. Only onValueChanged when the value has changed...
2017-03-02 18:07:24 +00:00
7a092e4ac7
Submit a new display name on blur of input field
2017-03-02 17:29:06 +00:00
0f8ab99158
Have COLOR_REGEX constant
2017-03-02 17:02:00 +00:00
9c6782af6f
Oops, lost trackPromise
2017-03-02 15:08:15 +00:00
91ef26a7f8
makeRegistrationUrl is required
2017-03-02 15:04:10 +00:00
51b2001f70
Remove todo which is now done!
2017-03-02 15:03:24 +00:00
88586a0823
Oops, lost defaultDeviceDisplayName
2017-03-02 15:01:56 +00:00
0914226327
Actuall pass our proxy makeRegistrationUrl
2017-03-02 14:47:47 +00:00
3028b335a4
Oops, re-add referrer param
...
as Registration was still using it
2017-03-02 14:46:18 +00:00
dd762cc835
Add makeRegistrationUrl to proptypes
2017-03-02 14:40:55 +00:00
a5cf3a964b
doc
2017-03-02 14:39:25 +00:00
518a749d90
Add proptypes / isRequired
2017-03-02 14:36:54 +00:00
770c1ce11f
Remove redundant prop
2017-03-02 14:35:08 +00:00
e75c21e9f9
Merge pull request #683 from matrix-org/luke/mels-xor
...
MELS: either expanded or summary, not both
2017-03-02 14:08:06 +00:00
8be66d0f04
Merge pull request #730 from Half-Shot/hs/video-gif-autoplay
...
Autoplay videos and GIFs if enabled by the user.
2017-03-02 13:41:30 +00:00
4b5e8d66b8
Fixed styling + removed log line
2017-03-02 13:39:56 +00:00
0035a91596
Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time
...
Warn users about using e2e for the first time
2017-03-02 13:28:15 +00:00
95cff17698
Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog
...
Show UDDialog on UDE during VoIP calls
2017-03-02 13:13:45 +00:00
b951713f7f
Remove custom attribs as consumed
2017-03-02 11:39:40 +00:00
36795fa192
Use data-mx[-bg]-color instead of stripping style
...
This has the benefit of not needing a spec for custom CSS. Instead we rigourously sanitise the values for custom data attributes that are transformed to CSS equivalents. `data-mx-color` translates to CSS `color` for example.
2017-03-02 11:36:56 +00:00
9c5fb00da4
Fix syntax
2017-03-01 18:33:45 +00:00
ef5d2bca91
Get errorText from error in stageUpdated
2017-03-01 16:59:25 +00:00
c9ef879afa
PR feedback: Move the email token request here
2017-03-01 16:04:15 +00:00
b7bd93c613
var -> const
2017-03-01 15:55:15 +00:00
187c91b76a
Adjust warning message
2017-03-01 15:42:05 +00:00
6d296a0e7a
Warn users about using e2e for the first time
2017-03-01 15:41:13 +00:00
39427839b9
Use ES6 export style
2017-03-01 14:33:25 +00:00
dd33624454
Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth
...
(This ended up mostly being merged by hand as git made a complete
mess of the merge)
2017-03-01 10:45:17 +00:00
f85c452e35
Merge pull request #726 from matrix-org/luke/rts-set-team-token-on-login
...
Notify MatrixChat of teamToken after login
2017-02-28 15:57:22 +00:00
a339316ede
Use a "normal" promise in order to .then
2017-02-28 15:40:49 +00:00
0ef8e2a8f4
Various fixes
2017-02-28 15:18:00 +00:00
48a3d0d595
Refactor to not set team token in bad ways
...
Use the on_logged_in dispatch instead. Call setPage in one place, _onLoggedIn, when deciding which page to view on login. Change some require to import, var to const. Remove onTeamMemberRegistered and just use a nullable argument to onRegistered
2017-02-28 15:05:49 +00:00
Luke Barnard