Commit Graph

13423 Commits (0450f432674c0e8460154eb7bf12fa1a956e62c1)

Author SHA1 Message Date
Bruno Windels 0450f43267 clarify how lhs collapsed state is stored 2019-01-31 10:19:05 +01:00
Bruno Windels 3251a055c2 allow LoggedInView to override collapseLhs
by updating prop through the dispatcher instead of
having it's own state that is OR'ed in.

before the state couldn't override the prop and you couldn't
expand the left panel anymore when MatrixChat
decided your viewport was too narrow
2019-01-31 10:18:54 +01:00
J. Ryan Stinnett 3a23423a43
Merge pull request #2537 from boeserwolf/develop
Fix typo
2019-01-30 10:37:33 -06:00
Bastian 3a409822fe Merge branch 'develop' of https://github.com/boeserwolf/matrix-react-sdk into develop 2019-01-30 17:28:21 +01:00
Bastian b96a4a4092 Fix typo
Signed-off-by: Bastian <matrix@noxware.de>
2019-01-30 17:27:53 +01:00
Bastian 89409347b3 Fix typo 2019-01-30 16:57:54 +01:00
Bruno Windels 3e7c3bfff8
Merge pull request #2535 from matrix-org/experimental
Merge redesign into develop
2019-01-30 12:49:27 +00:00
David Baker c3dcc2f9be
Merge pull request #2534 from matrix-org/bwindels/disable-e2e-test-everywhere
disable e2e tests everywhere as redesign breaks them for now
2019-01-30 12:35:19 +00:00
Bruno Windels 3a8e0aec48
Merge pull request #2533 from matrix-org/bwindels/avoidcomposerhscroll
avoid horizontal scrollbar in composer when placeholder doesn't fit
2019-01-30 12:35:10 +00:00
Bruno Windels 0251bb3869 disable e2e tests everywhere as redesign breaks them for now 2019-01-30 13:05:50 +01:00
Bruno Windels 13b97ee332 avoid horizontal scrollbar in composer when placeholder doesn't fit 2019-01-30 12:53:15 +01:00
Bruno Windels 3cfd851522
Merge pull request #2531 from matrix-org/bwindels/fixphonedropdown
fix dropdown style when input is shown
2019-01-30 11:45:02 +00:00
David Baker ae7b89eae9
Merge pull request #2530 from matrix-org/bwindels/minorfixup
Redesign: tiny fix: stretch device label in member info if content doesn't fill it
2019-01-30 11:43:13 +00:00
Bruno Windels 4d2a93eaaf
Merge pull request #2527 from jryans/auth-registration
Style registration flow
2019-01-30 11:27:45 +00:00
Bruno Windels 85b998d851 fix dropdown style when input is shown 2019-01-30 11:42:50 +01:00
Bruno Windels 3f7f984536 also don't stretch buttons when text is larger 2019-01-30 11:23:31 +01:00
Bruno Windels 015c14237d stretch device label in member info if content doesn't fill it 2019-01-30 11:20:20 +01:00
Bruno Windels 6aca7e4515
Merge pull request #2522 from matrix-org/bwindels/memberpanel-tiny-makeover
Redesign: small member info panel makeover
2019-01-30 10:01:33 +00:00
Bruno Windels 701919734f
Merge pull request #2529 from matrix-org/travis/fix-build
Render the home page when viewing the directory
2019-01-30 09:47:20 +00:00
Travis Ralston 728e92ccb3
Merge pull request #2528 from matrix-org/travis/settings/fix-css-indentation
Fix indentation on all new settings CSS
2019-01-30 00:21:37 -07:00
Travis Ralston 190b763c5d Render the home page when viewing the directory
The only time this happens is if someone goes to #/directory without previously visiting a page (ie: fresh landing).
2019-01-29 23:25:07 -07:00
Travis Ralston 68cd87a1c7 Fix indentation on all new settings CSS 2019-01-29 23:11:16 -07:00
Travis Ralston bdf2bb5601
Merge pull request #2526 from matrix-org/travis/settings/fixes-1
Round 1 of misc fixes for settings
2019-01-29 22:59:07 -07:00
Travis Ralston c145d4b65a
Merge pull request #2523 from matrix-org/travis/rsettings/tab/security
Implement the Security & Privacy tab of new room settings
2019-01-29 22:58:47 -07:00
Travis Ralston a2a49c1981 Regen i18n due to merge 2019-01-29 22:16:20 -07:00
Travis Ralston f86e224db6 Merge branch 'experimental' into travis/rsettings/tab/security 2019-01-29 22:15:55 -07:00
Travis Ralston 028c420d56
Merge pull request #2525 from matrix-org/travis/rsettings/tab/advanced
Implement the Advanced tab of new room settings
2019-01-29 22:14:53 -07:00
Travis Ralston da95bf9c08 Regen i18n due to merge 2019-01-29 21:50:13 -07:00
Travis Ralston cd54442add Merge branch 'experimental' into travis/rsettings/tab/advanced 2019-01-29 21:49:00 -07:00
Travis Ralston b3bb3aff84
Remove spurious void 2019-01-29 21:46:51 -07:00
Travis Ralston a9ede61dc7
Merge pull request #2524 from matrix-org/travis/rsettings/tab/roles
Implement the Roles & Permissions tab of new room settings
2019-01-29 21:32:36 -07:00
Travis Ralston 4d0a246629 Put a little padding between section headings 2019-01-29 19:28:30 -07:00
Travis Ralston f050323f98 Inherit font size from other elements for push notifications table 2019-01-29 19:18:13 -07:00
Travis Ralston 2aee2df6e9 Fix usage of semibold fonts
Fixes https://github.com/vector-im/riot-web/issues/8275
2019-01-29 19:11:04 -07:00
Travis Ralston 0591c3a2bb Change Riot Bot button text and make it a block element
Fixes https://github.com/vector-im/riot-web/issues/8265
2019-01-29 19:07:02 -07:00
Travis Ralston e7ed4c13f5 Appease the linter
I should really just get something that does this for me prior to opening a PR
2019-01-29 18:28:44 -07:00
Travis Ralston 2fe7f6fe1c Implement the Advanced tab of new room settings 2019-01-29 18:23:01 -07:00
J. Ryan Stinnett f05ddcacf0 Add footer text to registration form 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 61a3ddb4e3 Adjust registration field labels 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 25a2c3fe4d Tweak dropdown font 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 01d28bc137 Squeeze country dropdowns to match design 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 16b4f8fb6d Use new arrow for all dropdowns 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 92394ba601 Change country dropdown to be smaller with arrow on right 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett daee5f0325 Reorganize registration inputs 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 379b940bfa Add server details edit link to registration 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 160cc4e156 Wire up server details next button 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 1f78b59a0e Add create your account header 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 3f4001f1fe Correct stale name in props 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 23fc4417e8 Wire up server type selector, similar to login flow 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett ad76451655 Use render prefix for JSX methods in Login 2019-01-29 17:38:28 -06:00