Commit Graph

13277 Commits (7da5a55c7ea215b7ffa4b3454c556267ef447aaf)

Author SHA1 Message Date
J. Ryan Stinnett 7da5a55c7e Add space to CustomServerDialog, format like riot-web variant 2019-01-28 21:51:05 -06:00
J. Ryan Stinnett b0292929ba Update code style for ServerConfig components 2019-01-28 21:44:41 -06:00
J. Ryan Stinnett 7edd99c48c Change matrix.org logo to avoid fonts 2019-01-28 21:19:49 -06:00
J. Ryan Stinnett c84198afd1 Disable phases for now 2019-01-28 17:49:24 -06:00
J. Ryan Stinnett 34e2979f98 Add Modular server config screen 2019-01-28 17:32:56 -06:00
J. Ryan Stinnett c914db53ca Remove unused component ref 2019-01-28 16:52:10 -06:00
J. Ryan Stinnett d96e814a92 Add link to edit server details 2019-01-28 16:13:19 -06:00
J. Ryan Stinnett 8e9fc8a8e7 Make existing fields full width 2019-01-28 15:29:36 -06:00
J. Ryan Stinnett 398ded4a91 Switch to two phase login 2019-01-28 14:58:21 -06:00
J. Ryan Stinnett abe6fd2f60 Rework `ServerConfig` to approach design
The public server search box is left out for now, so this restyles the existing
custom server inputs to more closely approximate the design.
2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 3a698ef4fa Clean up Custom Server Help dialog 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett b1f698586e Style SSO login like a button 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 306380d647 Update HS / IS URLs when changing server types 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 344a5d1547 Style login type with primary color 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 7934a2950c Add 'Your account' header 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett e5e0b34958 Fix indentation 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett cd280ca79f Username is one word 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 73aeb26a79 Remove dead code for empty `matrixIdText` in `PasswordLogin` 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 350c24c503 Initial wiring of server type selector 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett fa4ad21e0a Remove dead code for `!withToggleButton` in `ServerConfig` 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 0bee324e48 Add server type selector component 2019-01-28 08:52:20 -06:00
David Baker eb7112cbc0
Merge pull request #2461 from matrix-org/dbkr/sas
Short-Authentication-String Verification
2019-01-28 09:45:59 +00:00
David Baker b4f02844a8 Merge remote-tracking branch 'origin/experimental' into dbkr/sas 2019-01-28 09:36:39 +00:00
J. Ryan Stinnett 4ac617c72b
Merge pull request #2513 from jryans/null-dvb
Fix unmount TypeError in `DeviceVerifyButtons`
2019-01-25 22:57:45 -06:00
J. Ryan Stinnett d1b78e5b08 Fix unmount TypeError in `DeviceVerifyButtons` 2019-01-25 17:54:11 -06:00
J. Ryan Stinnett a07ba49641
Merge pull request #2511 from matrix-org/jryans/rm-team-server
Remove support for team servers
2019-01-25 16:48:24 -06:00
Travis Ralston f969a35885
Merge pull request #2510 from matrix-org/travis/rsettings/tabify
Initial structure for new room settings
2019-01-25 15:25:31 -07:00
J. Ryan Stinnett 20b7debcaf Remove support for team servers 2019-01-25 16:13:30 -06:00
Travis Ralston 535d42684f Initial structure for new room settings 2019-01-25 13:09:44 -07:00
David Baker 2061ce2dbf
Merge pull request #2509 from matrix-org/dbkr/logout_warning_wording
Tweak wording on logout warning
2019-01-25 18:25:37 +00:00
David Baker 86e9417a19
Merge pull request #2508 from matrix-org/dbkr/fix_roomrecoveryreminder_npe
Fix NPE in RoomRecoveryReminder
2019-01-25 18:09:59 +00:00
David Baker 47c2ca3384 Tweak wording on logout warning
I further tweaked the wording from Tom's in the bug report to
put passphrases first since they are supposed to be the norm
(and the correct term is "recovery passphrase").

Fixes https://github.com/vector-im/riot-web/issues/8214
2019-01-25 18:01:40 +00:00
David Baker de9b964490 Fix NPE in RoomRecoveryReminder
Also fix a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/2506
where I failed to set the button caption in one case.

Fixes https://github.com/vector-im/riot-web/issues/8216
2019-01-25 17:49:02 +00:00
David Baker 7aa779c160 Remove outdated paragraph promising better verification 2019-01-25 17:31:46 +00:00
J. Ryan Stinnett 939f8b5591
Fullstop
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-01-25 17:30:59 +00:00
J. Ryan Stinnett e3cd50da1f
Fullstop
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-01-25 17:30:47 +00:00
J. Ryan Stinnett 44a5ee3e44
Add fullstop
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-01-25 17:30:22 +00:00
David Baker 1b5be8603c
Merge pull request #2506 from matrix-org/dbkr/room_recovery_reminder_verifydevice
New text/caption for key backup by verifying device
2019-01-25 17:13:09 +00:00
Travis Ralston 41bc2a3d0c
Merge pull request #2499 from matrix-org/travis/usettings/tab/security
Implement the "Security & Privacy" tab of new user settings
2019-01-25 09:44:00 -07:00
David Baker f6bbfd7e0d New text/caption for key backup by verifying device
https://github.com/vector-im/riot-web/issues/8072
2019-01-25 16:25:15 +00:00
Travis Ralston fb36f7abef Fix imports and quotes 2019-01-25 09:18:00 -07:00
Travis Ralston 3e69be5139 Regenerate i18n due to conflicts 2019-01-25 09:12:45 -07:00
Travis Ralston f7f23e4dea Merge branch 'experimental' into travis/usettings/tab/security 2019-01-25 09:12:07 -07:00
Travis Ralston 949343d7d5
Merge pull request #2505 from matrix-org/travis/settings/animated-toggles
Add simple animations to toggle switches
2019-01-25 07:51:38 -07:00
Travis Ralston 7a2cc3a242
Merge pull request #2503 from matrix-org/travis/settings/placeholders
Default a Field's placeholder to the label
2019-01-25 07:51:07 -07:00
Travis Ralston 3301c35f7d
Merge pull request #2501 from matrix-org/travis/settings/dialog-size
Have the settings dialog be fixed in size
2019-01-25 07:46:36 -07:00
Travis Ralston f58d016137
Merge pull request #2500 from matrix-org/travis/usettings/tab/help
Implement the "Help & About" tab of new user settings
2019-01-25 07:44:10 -07:00
Travis Ralston 9bbbab9d03 Add simple animations to toggle switches 2019-01-24 21:24:28 -07:00
Travis Ralston d819095a76 Default a Field's placeholder to the label
Fixes https://github.com/vector-im/riot-web/issues/8250

This keeps all fields in line with the design without them having to defining it twice. The option is kept in the first place as some fields might want to override the placeholder to be longer than the label or something.
2019-01-24 19:36:23 -07:00
Travis Ralston 5dc75e2d3c Have the settings dialog be fixed in size
This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well.
2019-01-24 19:12:09 -07:00