Merge redesign into develop #2535
bwindels
merged
925 commits into
develop
from
experimental
Merge pull request #2486 from matrix-org/travis/fix-hover
4c12b2c9
Merge pull request #2481 from matrix-org/bwindels/showroomsandpeoplew…
45c4ca31
Merge pull request #2471 from matrix-org/dbkr/keep_going
e558d271
Merge pull request #2476 from matrix-org/travis/modal-tab-settings
94b1d739
Fix desktop captcha check
6d7e88a8
Merge pull request #2487 from matrix-org/dbkr/desktop_robot_check_check
10346087
Move language selector to auth header
36ebd91f
Extract language selector styles
f9793fa5
Tweak language selector to match design
05254f0e
Use new dropdown arrow for language selector
523d910c
Template out remaining sections
de81c8d7
Finish the box for displayname/avatar changes
f643d7a1
Bring flair into the new settings
677b3ca7
Bring in the change password section
19de6694
Move profile settings to a dedicated component
fa1ce61a
Bring over email address management
aa7afe81
Include a ref so that get/set value works again
875c0f94
Early de-linting
4a819d31
WIP to port prototype code
5bddf62d
Merge remote-tracking branch 'origin/experimental' into dbkr/sas
6a90625d
Re-do npm run i18n because things got weird
6e35a7f3
Bring over phone number management
d55d1452
Bring in theme and language options
97666d39
Merge pull request #2488 from jryans/auth-lang
35035621
Update login header text
2f89af4f
Update forgot password link text and style
e396954a
Clear out other login link styles
2bb5a1d6
Remove create account from forgot password
e0e873d0
Rename links for changing auth flow
9b3d674a
Update text to change auth flows
f069833a
Update registration header text
8241f09b
Add header text to forgot password
df76a312
Remove unneeded style from forgot password
f4bbfc4a
Move LanguageSelector to views
9f5f552b
Add a ToggleSwitch and use it for SettingsFlag
3f897468
Bring over the deactivate account button
7fb0cd6c
Touchups to toggles in settings
40f6aeba
Appease the linter
6f947ab6
Merge pull request #2490 from jryans/lang-selector-view
74a5dd42
Fix linting error
dccc9dc4
Enable linting for all auth related files
9470424b
Fix remaining warnings for enabled files
319369d1
Merge pull request #2489 from jryans/auth-text-and-links
41c79a93
Merge pull request #2493 from jryans/auth-lint
7b5500b9
Minor CSS adjustments
736aa829
more fixes for updates/resizing
1092244b
integrate layout/distributor with RoomList
067a861f
remove flexbox layout
a5297303
prevent height doubling when resizing
b230e65e
use offsetHeight for consistency with sizer
636955da
Merge pull request #2491 from matrix-org/travis/usettings/tab/general
2a9f6186
Implement labs tab in new user settings
f1c1caac
Actually include the lazy loading function
d2684638
Add missing import
1251f607
Regenerate i18n
7249247c
Add target="_blank" to links that don't have it
4bcb9f12
Merge pull request #2492 from matrix-org/travis/usettings/tab/labs
73bce4d6
Embed existing notifications settings into the tab
d267f232
Styling to match the other tabs a bit closer
06a9ab3a
Appease the linter
a9243cf8
Regenerate i18n
98eb95b5
initial support for collapsing
4eb2555f
Lint
ade43c4e
Merge pull request #2494 from matrix-org/travis/usettings/tab/notific…
479b354d
Implement the "Preferences" tab on new user settings
5479a4da
Merge pull request #2496 from matrix-org/dbkr/target_blank
8c412b85
Force font family upon Fields
524d2f1e
Merge pull request #2495 from matrix-org/travis/usettings/tab/prefere…
13e36bce
Add widget screenshots to the Labs section
67ba7284
Merge pull request #2497 from matrix-org/travis/usettings/tab/labs-sc…
77b551a9
Implement the "Voice & Video" tab of new user settings
27ee6625
Swap out the media permissions text for a paragraph element
a4e0796b
Appease the linter
3e09cd1d
Fix sizings and margins
87cea5ef
Also the font size
0f896684
Merge pull request #2498 from matrix-org/travis/usettings/tab/voice
c5deeeac
Implement the "Security & Privacy" tab of new user settings
b0a8cbf7
Implement the "Help & About" tab of new user settings
1f10cda5
Have the settings dialog be fixed in size
5dc75e2d
Override UA/OS styles for disabled Field selects
284be265
Default a Field's placeholder to the label
d819095a
Be more positive with setting labels
cb6f415a
Add simple animations to toggle switches
9bbbab9d
Merge pull request #2500 from matrix-org/travis/usettings/tab/help
f58d0161
Merge pull request #2501 from matrix-org/travis/settings/dialog-size
3301c35f
Merge pull request #2503 from matrix-org/travis/settings/placeholders
7a2cc3a2
Merge pull request #2505 from matrix-org/travis/settings/animated-tog…
949343d7
Invert setting values in a common place
d136c33a
Improve disabled Field styling
aeac8220
Merge branch 'experimental' into travis/usettings/tab/security
f7f23e4d
Regenerate i18n due to conflicts
3e69be51
Fix imports and quotes
fb36f7ab
New text/caption for key backup by verifying device
f6bbfd7e
Appease the linter
e1bc1eee
Merge pull request #2499 from matrix-org/travis/usettings/tab/security
41bc2a3d
Merge pull request #2506 from matrix-org/dbkr/room_recovery_reminder_…
1b5be860
Add fullstop
44a5ee3e
Fullstop
e3cd50da
Fullstop
939f8b55
Remove outdated paragraph promising better verification
7aa779c1
add matthews new resize algo
8ffeee6a
rerender roomlist when banner gets shown/hidden, to update the layout
cb9ebf8b
update layout on window resize
2d2f9712
Fix NPE in RoomRecoveryReminder
de9b9644
Tweak wording on logout warning
47c2ca33
Merge pull request #2508 from matrix-org/dbkr/fix_roomrecoveryreminde…
86e9417a
Merge pull request #2509 from matrix-org/dbkr/logout_warning_wording
2061ce2d
Initial structure for new room settings
535d4268
Remove support for team servers
20b7debc
Merge pull request #2510 from matrix-org/travis/rsettings/tabify
f969a358
Proof of concept for a flair tab in user settings
57e45e7e
Remove unused import
e2ba1cc0
Merge pull request #2511 from matrix-org/jryans/rm-team-server
a07ba496
Fix unmount TypeError in `DeviceVerifyButtons`
d1b78e5b
Merge pull request #2513 from jryans/null-dvb
4ac617c7
Merge remote-tracking branch 'origin/experimental' into dbkr/sas
b4f02844
Merge pull request #2461 from matrix-org/dbkr/sas
eb7112cb
WIP on persisting height across collapse/expand
0a5e8e6c
unify heights stored by id and index, to avoid them getting out of sync
bfb1031a
fix lint
d08216e8
fix lint - bis
f103e60d
fix lint - bis bis
eaf212dd
Add server type selector component
0bee324e
Remove dead code for `!withToggleButton` in `ServerConfig`
fa4ad21e
Initial wiring of server type selector
350c24c5
Remove dead code for empty `matrixIdText` in `PasswordLogin`
73aeb26a
Username is one word
cd280ca7
Fix indentation
e5e0b349
Add 'Your account' header
7934a295
Style login type with primary color
344a5d15
Update HS / IS URLs when changing server types
306380d6
Style SSO login like a button
b1f69858
Clean up Custom Server Help dialog
3a698ef4
Rework `ServerConfig` to approach design
abe6fd2f
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout
55e0838c
assign default height after assigning new sections
14485b60
ignore updates that don't change anything
d56f77de
add comments to fields
87720bac
always hide overflow on RoomList in case Layout screws up
79a44b1b
remove obsolete logging and comments
dab1f30a
better naming for anchor
6e55ebda
Merge branch 'experimental' into travis/settings/positive
a1e3887a
floor default section height
d833174d
better naming
b0bb4eb5
Merge pull request #2514 from matrix-org/bwindels/roomlistjslayout-bis
2d61a250
Merge pull request #2504 from matrix-org/travis/settings/positive
6683a998
don't over-constraint layout while resizing
88f25dec
add option for whitespace behaviour and handle height
8d1e105b
Icon for flair tab
3d59cf99
Merge pull request #2502 from matrix-org/travis/settings/disabled-sel…
c204cd7b
Rename GeneralSettingsTab to GeneralUserSettingsTab
b7d0dd44
Early tab structure and profile changes (name/avatar/topic)
243feb9b
Early support for alias modification in room settings
9a524c49
Minor styling and avatar bug fixing
ea1d6a01
Move RoomProfileSettings to the right place
3021464e
Flair settings for rooms
87e6652b
Implement leave room button and URL preview settings
db346665
Default the topic to an empty string otherwise React gets mad
fd6d34c2
Regenerate i18n
8205cc04
Switch to two phase login
398ded4a
Appease the linter
9513837e
Disable room settings tests
d20bdbbc
Make existing fields full width
8e9fc8a8
Add link to edit server details
d96e814a
Remove unused component ref
c914db53
Add Modular server config screen
34e2979f
Disable phases for now
c84198af
Iterate upon the room upgrade warning bar
f8de4ba2
Appease the linter
5948f9bc
Change matrix.org logo to avoid fonts
7edd99c4
Condense CSS rules and use box-sizing instead of math
70b34aa2
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair
d34390d2
Update code style for ServerConfig components
b0292929
Add space to CustomServerDialog, format like riot-web variant
7da5a55c
Restore SVG indentation
a6003dc6
Merge pull request #2517 from jryans/auth-server-type-selector
20bf683d
Merge pull request #2470 from matrix-org/bwindels/css-scrollbars
cc2b6f95
avoid whitespace and expand all matching section when filtering
529c48d1
Merge pull request #2515 from matrix-org/bwindels/roomlistjslayout-bi…
012e3581
room directory makeover
9f1b4ac4
fix lint
7c0f463c
show invite count in invite sublist header
818061d5
prevent badge jumping when hovering over sublist
495f264a
show Guest instead of random username when in guest mode
2db0a9c0
fix lint - bis
57b2f691
add icons to top left menu options
6ffc5e09
Merge branch 'experimental' into travis/rsettings/tab/general
ad276c1f
Tweak auth overflow on Windows and Linux
049ad400
dont allow whitespace in room sub lists while resizing
6dc04228
Merge pull request #2521 from jryans/auth-overflow
cc6a0bf5
Merge pull request #2516 from matrix-org/travis/rsettings/tab/general
c0901188
make resize handle not overlap with left panel sublist scrollbars
1b82ec6e
run i18n
9ba592b2
run i18n
bcd4a53d
Merge branch 'experimental' into bwindels/redesign-smallfixes
15a74cac
Merge pull request #2520 from matrix-org/bwindels/redesign-smallfixes
8e7f3e1a
Merge branch 'experimental' into bwindels/roomdirectory-makeover
855dbd7d
Merge pull request #2518 from matrix-org/travis/rver-cap-support
a16eb30c
Merge pull request #2519 from matrix-org/bwindels/roomdirectory-makeover
0cce912c
small makeover of member info panel
7d6f5518
Implement the Security & Privacy tab of new room settings
a2f516c4
Appease the linter
76c31f01
Implement the Roles & Permissions tab of new room settings
0af41963
Appease the linter
93ce342d
Take out unfederated warning
78314ef2
Prune unused auth styles
88fd2e79
Error on top to match login
2f87d0c8
Use render prefix for JSX methods in Login
ad764516
Wire up server type selector, similar to login flow
23fc4417
Correct stale name in props
3f4001f1
Add create your account header
1f78b59a
Wire up server details next button
160cc4e1
Add server details edit link to registration
379b940b
Reorganize registration inputs
daee5f03
Change country dropdown to be smaller with arrow on right
92394ba6
Use new arrow for all dropdowns
16b4f8fb
Squeeze country dropdowns to match design
01d28bc1
Tweak dropdown font
25a2c3fe
Adjust registration field labels
61a3ddb4
Add footer text to registration form
f05ddcac
Implement the Advanced tab of new room settings
2fe7f6fe
Appease the linter
e7ed4c13
Change Riot Bot button text and make it a block element
0591c3a2
Fix usage of semibold fonts
2aee2df6
Inherit font size from other elements for push notifications table
f050323f
Put a little padding between section headings
4d0a2466
Merge pull request #2524 from matrix-org/travis/rsettings/tab/roles
a9ede61d
Remove spurious void
b3bb3aff
Merge branch 'experimental' into travis/rsettings/tab/advanced
cd54442a
Regen i18n due to merge
da95bf9c
Merge pull request #2525 from matrix-org/travis/rsettings/tab/advanced
028c420d
Merge branch 'experimental' into travis/rsettings/tab/security
f86e224d
Regen i18n due to merge
a2a49c19
Merge pull request #2523 from matrix-org/travis/rsettings/tab/security
c145d4b6
Merge pull request #2526 from matrix-org/travis/settings/fixes-1
bdf2bb56
Fix indentation on all new settings CSS
68cd87a1
Render the home page when viewing the directory
190b763c
Merge pull request #2528 from matrix-org/travis/settings/fix-css-inde…
728e92cc
Merge pull request #2529 from matrix-org/travis/fix-build
70191973
Merge pull request #2522 from matrix-org/bwindels/memberpanel-tiny-ma…
6aca7e45
stretch device label in member info if content doesn't fill it
015c1423
also don't stretch buttons when text is larger
3f7f9845
fix dropdown style when input is shown
85b998d8
Merge pull request #2527 from jryans/auth-registration
4d2a93ea
Merge pull request #2530 from matrix-org/bwindels/minorfixup
ae7b89ea
Merge pull request #2531 from matrix-org/bwindels/fixphonedropdown
3cfd8515
avoid horizontal scrollbar in composer when placeholder doesn't fit
13b97ee3
disable e2e tests everywhere as redesign breaks them for now
0251bb38
Merge pull request #2533 from matrix-org/bwindels/avoidcomposerhscroll
3a8e0aec
Merge pull request #2534 from matrix-org/bwindels/disable-e2e-test-ev…
c3dcc2f9
dbkr
approved these changes
on 2019-01-30
Login to write a write a comment.
Login via GitHub