Commit Graph

3346 Commits

Author SHA1 Message Date
Matthew Hodgson
75eca60d76 Merge pull request #4037 from vector-im/luke/new-guest-access-login-button
Add "Login" button to RHS when user is a guest
2017-05-26 18:47:26 +01:00
Luke Barnard
aa604612a7 Add "Login" button to RHS when user is a guest 2017-05-26 18:42:07 +01:00
Luke Barnard
aa357ff6de Always show HomeButton 2017-05-26 10:33:48 +01:00
Luke Barnard
b25e6eb2a9 Merge pull request #4026 from vector-im/luke/new-guest-access-rejig-nagbar
Rejig the PaswordNagBar
2017-05-25 17:57:16 +01:00
Luke Barnard
1db3ba676d Rejig the PaswordNagBar
- Change the nag bar to read "To return to your account in future you need to set a password"
 - Underline "Set a password"
 - Make the whole thing clickable
2017-05-25 15:33:40 +01:00
Luke Barnard
790fc7ca4a Remove "new" from set password dialog 2017-05-25 15:26:44 +01:00
Luke Barnard
6c1b6f0476 Merge pull request #4024 from vector-im/luke/new-guest-access-fix-team-server-no-config
Allow team server config to be missing
2017-05-25 15:07:59 +01:00
Luke Barnard
3779b74dae Remove GuestWarningBar.scss from _components.scss 2017-05-25 14:51:24 +01:00
Luke Barnard
41e7706bc6 Allow team server config to be missing
, default to welcome page if either the teamToken or teamServerURL is undefined.
2017-05-25 14:35:59 +01:00
David Baker
2fde2d58b6 Merge pull request #4020 from vector-im/luke/remove-guest-warning-bar
Remove GuestWarningBar
2017-05-25 14:30:14 +01:00
David Baker
85aa390c8f Merge pull request #4023 from vector-im/luke/new-guest-access-left-panel
Make left panel better for new users (mk III)
2017-05-25 14:17:34 +01:00
Luke Barnard
9d28c8f577 Move ref to outer div 2017-05-25 13:49:41 +01:00
David Baker
284aeeb43e Call out icons on hover
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 39229c5.
2017-05-25 12:19:26 +01:00
David Baker
bf716add99 Dedicated classes for the buttons 2017-05-25 12:08:14 +01:00
David Baker
fce1164b58 Align buttons better with the text 2017-05-25 12:08:06 +01:00
David Baker
9b1ffe6fda Remove slightly misleading commented code 2017-05-25 12:07:59 +01:00
David Baker
a5ea19b900 Remove commented code 2017-05-25 12:07:54 +01:00
Luke Barnard
e3342e36c0 Fix RoomSubList (RoomSubListHeader was removed) 2017-05-25 12:07:39 +01:00
David Baker
67ecd94b4a Make bottom left menu buttons use RoleButton too
Conflicts:
	src/components/structures/BottomLeftMenu.js

cherry-picking commit 2bf0074.
2017-05-25 12:06:49 +01:00
David Baker
d81f894a50 Add buttons to room sub list headers
Conflicts:
	src/components/structures/RoomSubList.js
	src/components/structures/RoomSubListHeader.js

cherry-picking commit 095da68.
2017-05-25 11:58:12 +01:00
David Baker
af305ea540 Make left panel more friendly to new users
https://github.com/vector-im/riot-web/issues/3609
2017-05-25 11:42:12 +01:00
Luke Barnard
365a46777c Remove GuestWarningBar 2017-05-25 11:02:26 +01:00
Luke Barnard
36ec156d2e Merge pull request #4015 from vector-im/luke/new-guest-access-default-welcome
Implement default welcome page and allow custom URL /w config
2017-05-25 10:28:55 +01:00
Luke Barnard
e253f86c63 Improve teamToken prop doc on homePage 2017-05-25 10:23:26 +01:00
Luke Barnard
43bd88777c Remove potentially confusing sample config 2017-05-25 10:10:26 +01:00
Luke Barnard
efb6316ba0 Implement default welcome page and allow custom URL /w config
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
2017-05-24 17:58:03 +01:00
Luke Barnard
299dc7fe84 Merge branch 'develop' into new-guest-access 2017-05-22 16:17:36 +01:00
David Baker
b057e8a92f Merge pull request #3989 from vector-im/luke/new-guest-access-set-pwd-dialog-fuzzy
Add warm-fuzzy for successful password entry
2017-05-22 16:15:00 +01:00
Luke Barnard
9fc57786f1 Add warm-fuzzy for successful password entry 2017-05-22 16:11:52 +01:00
David Baker
24584bee4a Merge pull request #3982 from vector-im/luke/new-guest-access-autoFocus-new-password
autoFocus new password input in SetPasswordDialog
2017-05-22 15:57:45 +01:00
Luke Barnard
5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +01:00
David Baker
73ec3e1f4d Merge branch 'master' into develop 2017-05-22 11:44:31 +01:00
David Baker
86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker
734a28e0f3 Prepare changelog for v0.9.10 2017-05-22 11:41:09 +01:00
David Baker
5c4e3cec08 v0.9.10 2017-05-22 11:40:10 +01:00
David Baker
c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
David Baker
dc990f47be Fix app breakage with a 'version' file
Re-add accidenally removed variable initialiser
2017-05-19 17:02:48 +01:00
David Baker
a9b5282ba3 Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
David Baker
d7f1e01cfa Don't fail if reskindex symlink exists 2017-05-19 14:47:44 +01:00
Richard van der Hoff
0a920df05d Merge pull request #3966 from vector-im/rav/more_deflakification
More riot-web test deflakification
2017-05-19 13:51:51 +01:00
Richard van der Hoff
ea67fa9c16 More riot-web test deflakification
Two changes:

1. wait longer for /sync to arrive in the loading tests, via an
   `expectAndAwaitSync` method.

2. https://github.com/matrix-org/matrix-react-sdk/pull/773 made it possible for
   MatrixChat to not show its syncing spinner despite `loading` being
   false. Update `awaitSyncingSpinner` accordingly, so that it doesn't fail
   when it happens to check MatrixChat at just taht moment.
2017-05-19 13:33:50 +01:00
David Baker
50b46af943 Merge pull request #3945 from vector-im/dbkr/fetch_deps_script
Script to fetch corresponding branches of dependent projects
2017-05-19 13:14:07 +01:00
David Baker
68a39b2783 Update process to not set deps to #develop
Update README instructions and add checks to release script to
prevent us forgetting to bump the versions of dependencies
(because the check in the main release script will only catch
references to #develop left in, which will no longer be the
failure mode).
2017-05-19 11:59:27 +01:00
Luke Barnard
448ac8dce1 Merge pull request #3964 from vector-im/luke/fix-logo-svgs-style-type
Add type="text/css" to SVG logos
2017-05-19 11:38:27 +01:00
Luke Barnard
76bf869d87 Add type="text/css" to SVG logos
Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.
2017-05-19 11:19:30 +01:00
David Baker
da14d7eb8c v0.9.10-rc.1 2017-05-19 10:43:11 +01:00
David Baker
3a44cb65b7 Prepare changelog for v0.9.10-rc.1 2017-05-19 10:43:10 +01:00
David Baker
029dfe5ed0 v0.9.10-rc.1 2017-05-19 10:41:22 +01:00
David Baker
c0c1972d56 Released js-sdk & react-sdk 2017-05-19 10:40:44 +01:00
Richard van der Hoff
b886215fdd Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting
Fix some setState-after-unmount in roomdirectory
2017-05-18 19:06:18 +01:00