This website requires JavaScript.
6996291f0c
Store retrieved sid in the signupInstance of EmailIdentityStage
Luke Barnard
2017-02-14 11:00:40 +00:00
17b08aedfc
Merge pull request #691 from matrix-org/dbkr/interactive_auth_nondialog
David Baker
2017-02-14 10:55:12 +00:00
1bc9ba46c7
Merge pull request #3217 from vector-im/dbkr/interactive_auth_nondialog
David Baker
2017-02-14 10:55:01 +00:00
43a740df15
Add busy param to docs
David Baker
2017-02-14 10:34:43 +00:00
ba3e62e395
Remove old docs
David Baker
2017-02-14 10:31:56 +00:00
18cba1fe45
Merge pull request #689 from matrix-org/luke/rts-set-team-token-view-home
David Baker
2017-02-14 10:21:23 +00:00
36d126f3a9
PR feedback
David Baker
2017-02-13 19:09:43 +00:00
8fc3104507
Replace submit button with a spinner when busy
David Baker
2017-02-13 18:52:33 +00:00
c6ccfa0616
Copyright
David Baker
2017-02-13 16:15:27 +00:00
77b226631a
Copyright
David Baker
2017-02-13 16:15:00 +00:00
9e2793dfed
Style for split-out interactive auth
David Baker
2017-02-13 16:10:43 +00:00
79d9deb339
Split out InterActiveAuthDialog
David Baker
2017-02-13 16:03:21 +00:00
16e3365240
Use a callback prop instead of window.
Luke Barnard
2017-02-13 14:36:03 +00:00
a21e71f59d
Merge pull request #688 from matrix-org/luke/rts-use-sid-client-secret
Luke Barnard
2017-02-13 13:49:23 +00:00
b45da45457
Merge pull request #686 from matrix-org/luke/rts-enable-branded-urls
David Baker
2017-02-13 13:38:55 +00:00
75deb55844
Null check on teamName
Luke Barnard
2017-02-13 11:48:03 +00:00
6a7daaf6c4
remove GA, given it's increasingly useless given Riot/Desktop doesn't use it, plus it obviously has privacy implications. It may get re-added as opt-in in future, so we're not sailing entirely blind on how folks use the app, or we may switch to Piwik etc instead.
Matthew Hodgson
2017-02-10 17:21:02 +00:00
4ac769168a
View /home on registered /w team
Luke Barnard
2017-02-10 17:17:58 +00:00
29f5e88f6a
Instead of sending userId, userEmail, send sid, client_secret
Luke Barnard
2017-02-10 16:50:25 +00:00
33fc4f7d8d
Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon
David Baker
2017-02-10 16:39:11 +00:00
c46f282139
Comments
Kegan Dougal
2017-02-10 16:19:39 +00:00
f628ee2ef0
Merge branch 'develop' into kegan/indexeddb
Kegan Dougal
2017-02-10 16:16:17 +00:00
bdd031eac2
Enable branded URLs again by parsing the path client-side
Luke Barnard
2017-02-10 15:09:45 +00:00
407bcf1bb9
Delete database on logout. DI a SyncAccumulator. Log uncaught errors
Kegan Dougal
2017-02-10 14:22:54 +00:00
a5a43bcd93
Merge pull request #685 from matrix-org/luke/rts-session-team-token
Luke Barnard
2017-02-10 13:58:03 +00:00
ec730056d8
Alter comment
Luke Barnard
2017-02-10 11:39:22 +00:00
bab6a0b84a
Persist query parameter team token across refreshes
Luke Barnard
2017-02-10 11:31:04 +00:00
b6741d9b10
Merge pull request #3196 from vector-im/luke/rts-thread-team-token
David Baker
2017-02-10 10:43:24 +00:00
8bd7d90ca2
Merge pull request #684 from matrix-org/luke/rts-thread-teamToken
David Baker
2017-02-10 10:42:59 +00:00
45f5b8b3a9
Thread teamToken through to LeftPanel for "Home" button
Luke Barnard
2017-02-10 09:57:28 +00:00
78aaf6b47e
Use the teamToken threaded through from react sdk
Luke Barnard
2017-02-10 09:56:15 +00:00
36b08fece7
Float the toggle in the top right of MELS
Luke Barnard
2017-02-09 15:17:03 +00:00
8d3876c7d0
MELS: either expanded or summary, not both
Luke Barnard
2017-02-09 15:14:16 +00:00
69add8fd64
Actually use the RTS URL
Luke Barnard
2017-02-09 13:16:46 +00:00
ae03244e6e
Merge branch 'develop' into luke/feature-css-msg-colors
Luke Barnard
2017-02-09 13:14:15 +00:00
f2a6d2cc5a
fix selector color
Matthew Hodgson
2017-02-09 12:01:00 +00:00
22b7b8efea
tweak sending color some more
Matthew Hodgson
2017-02-09 11:02:42 +00:00
7ba9e27893
Merge pull request #682 from matrix-org/luke/fix-typing-notif
David Baker
2017-02-09 10:46:37 +00:00
dd22e57a38
Merge pull request #681 from matrix-org/luke/rts-matrix-org
Luke Barnard
2017-02-09 10:34:02 +00:00
103710728f
Do not show "+1 other"
Luke Barnard
2017-02-09 10:30:06 +00:00
553054409f
Use (props,state) ordering of arguments
Luke Barnard
2017-02-09 10:01:59 +00:00
cc69e982a7
Use single state to set both avatars and typing notif
Luke Barnard
2017-02-09 10:01:51 +00:00
40658494b4
Consider emails ending in matrix.org as a uni email
Luke Barnard
2017-02-09 09:29:55 +00:00
747c0c44a6
Use new method of getting team icon
Luke Barnard
2017-02-09 09:24:46 +00:00
ad2710ec5d
fix CSS for import/export buttons
Matthew Hodgson
2017-02-09 02:00:58 +00:00
e392d6c16b
fix CSS for import/export buttons
Matthew Hodgson
2017-02-09 02:00:23 +00:00
2eec9b10ef
fix dark skin event sending color
Matthew Hodgson
2017-02-09 01:42:36 +00:00
64f0beb1eb
fix https://github.com/vector-im/riot-web/issues/3136
Matthew Hodgson
2017-02-09 01:33:26 +00:00
ea50acfc87
fix dark theme for uploadbar
Matthew Hodgson
2017-02-09 01:26:53 +00:00
f6b6673a41
fix selection text colour in dark theme
Matthew Hodgson
2017-02-09 01:20:30 +00:00
231997dd63
unbreak /markdown off
Matthew Hodgson
2017-02-09 01:18:09 +00:00
d8042b193b
be more specific on flex
Matthew Hodgson
2017-02-09 00:10:57 +00:00
5f745ff733
hopefully fix TopRight layout bug
Matthew Hodgson
2017-02-09 00:10:45 +00:00
bac142ad26
fix tintability of home button
Matthew Hodgson
2017-02-08 23:28:30 +00:00
caa30a742b
fix table visuals in dark skin
Matthew Hodgson
2017-02-08 23:19:05 +00:00
449519dc32
Merge pull request #679 from matrix-org/luke/rts-email-verif-referrer
Luke Barnard
2017-02-08 22:05:49 +00:00
f1288d85ba
Merge pull request #678 from matrix-org/luke/rts-fix-undefined-team-token
David Baker
2017-02-08 18:08:12 +00:00
c2d5b72d68
Set referrer qp in nextLink
Luke Barnard
2017-02-08 17:58:40 +00:00
260cb62438
Do not set team_token if not returned by RTS on login
Luke Barnard
2017-02-08 16:49:33 +00:00
fe17e2452b
Merge pull request #676 from matrix-org/luke/rts-team-token-login
David Baker
2017-02-08 10:54:24 +00:00
d7bc47c357
Merge pull request #3169 from vector-im/kegan/bugs-file-server
Richard van der Hoff
2017-02-08 10:37:35 +00:00
5f678eb838
Review comments: change realm name
Kegan Dougal
2017-02-08 10:36:39 +00:00
64eb1f08a9
rageshake: Add file server with basic auth
Kegan Dougal
2017-02-08 09:59:41 +00:00
85e6057598
Merge pull request #3162 from vector-im/luke/rts-fix-blm-team-token
David Baker
2017-02-08 09:54:33 +00:00
8fea4c27cb
fix NPE
Matthew Hodgson
2017-02-07 22:00:56 +00:00
b080e5797b
Merge remote-tracking branch 'origin/master' into develop
Richard van der Hoff
2017-02-07 21:46:08 +00:00
f629b2f631
CONTRIBUTING: s/vector/riot/
Richard van der Hoff
2017-02-07 21:45:34 +00:00
c4ee47aa15
Merge branch 'master' into develop
Richard van der Hoff
2017-02-07 21:40:18 +00:00
0c7c31e3bb
Merge branch 'master' into rav/issue_template
Richard van der Hoff
2017-02-07 21:29:35 +00:00
0442258865
More issue_template tweaks
Richard van der Hoff
2017-02-07 21:19:09 +00:00
95f529f9a4
Tweak ISSUE_TEMPLATE
Richard van der Hoff
2017-02-07 20:25:45 +00:00
be71da5657
Merge pull request #3150 from vector-im/kegan/dir-per-bug
David Baker
2017-02-07 16:18:00 +00:00
f16bb85f9b
Review comments
Kegan Dougal
2017-02-07 16:04:06 +00:00
3d30db81e0
Only init RTS if configured correctly
Luke Barnard
2017-02-07 15:24:57 +00:00
3f9f59bb73
Import RtsClient at top
Luke Barnard
2017-02-07 15:23:23 +00:00
5b239adfb8
Fix bug with home icon not appearing when logged in as team member
Luke Barnard
2017-02-07 14:58:25 +00:00
96539a4054
Merge pull request #666 from matrix-org/luke/rts-welcome-pages
David Baker
2017-02-07 13:42:47 +00:00
d5f6ecdc49
Use teamToken, not config when doing screen fallback
Luke Barnard
2017-02-07 13:23:58 +00:00
c93b6c3c34
Style, fixes
Luke Barnard
2017-02-07 13:15:40 +00:00
af19ea8bb7
Document login API
Luke Barnard
2017-02-07 12:01:44 +00:00
2f54034afe
Merge pull request #3103 from vector-im/luke/rts-welcome-pages
David Baker
2017-02-07 11:52:59 +00:00
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
Luke Barnard
2017-02-07 12:41:52 +01:00
35bc384c51
Set team token in state on mount
Luke Barnard
2017-02-07 11:39:31 +00:00
d490bd8638
Use home.html rather than welcome.html
Luke Barnard
2017-02-07 11:35:17 +00:00
8d4f81ff67
Remove redundant inline style
Luke Barnard
2017-02-07 11:34:49 +00:00
648204b6f9
Use import
Luke Barnard
2017-02-07 11:34:34 +00:00
3f49f020cf
Copyright
Luke Barnard
2017-02-07 11:19:01 +00:00
c0d2fe19ef
Merge pull request #677 from matrix-org/rav/logging_for_send_fail
David Baker
2017-02-06 16:46:54 +00:00
678eccf33d
Store bug reports in separate directories
Kegan Dougal
2017-02-06 16:18:08 +00:00
484d9d708e
Logging to try to track down riot-web#3148
Richard van der Hoff
2017-02-06 16:01:25 +00:00
1f0b4853be
Merge pull request #3149 from vector-im/kegan/go-stds
Kegsay
2017-02-06 15:40:58 +00:00
db31f0a087
Host API under /api. Use filepath.Join rather than string concatenation
Kegan Dougal
2017-02-06 15:31:53 +00:00
d4247e0179
Dump to bugs subdirectory
Kegan Dougal
2017-02-06 14:56:06 +00:00
77f76db68b
UserSettings: s/vector-web/riot-web/
Richard van der Hoff
2017-02-06 09:50:14 +00:00
af765c7522
Merge branch 'master' into develop
Richard van der Hoff
2017-02-04 11:04:25 +00:00
dc1a0c554f
v0.9.7
v0.9.7
Richard van der Hoff
2017-02-04 10:55:46 +00:00
08cdf21aee
Prepare changelog for v0.9.7
Richard van der Hoff
2017-02-04 10:55:46 +00:00
cd7bc3bfd3
Bump to js-sdk 0.7.5 and react-sdk 0.8.6
Richard van der Hoff
2017-02-04 10:52:41 +00:00
6d8dcd97af
Merge branch 'master' into develop
Richard van der Hoff
2017-02-04 10:42:31 +00:00
a9cd1bfd4b
v0.8.6
Richard van der Hoff
2017-02-04 10:30:16 +00:00