Commit Graph

13477 Commits

Author SHA1 Message Date
Travis Ralston
9513837e97 Appease the linter 2019-01-28 13:59:09 -07:00
J. Ryan Stinnett
398ded4a91 Switch to two phase login 2019-01-28 14:58:21 -06:00
Travis Ralston
8205cc04e4 Regenerate i18n 2019-01-28 13:54:56 -07:00
Travis Ralston
fd6d34c2de Default the topic to an empty string otherwise React gets mad 2019-01-28 13:54:56 -07:00
Travis Ralston
db34666583 Implement leave room button and URL preview settings 2019-01-28 13:54:56 -07:00
Travis Ralston
87e6652b2a Flair settings for rooms 2019-01-28 13:54:56 -07:00
Travis Ralston
3021464e89 Move RoomProfileSettings to the right place 2019-01-28 13:54:56 -07:00
Travis Ralston
ea1d6a0146 Minor styling and avatar bug fixing 2019-01-28 13:54:56 -07:00
Travis Ralston
9a524c49b1 Early support for alias modification in room settings 2019-01-28 13:54:56 -07:00
Travis Ralston
243feb9b13 Early tab structure and profile changes (name/avatar/topic) 2019-01-28 13:54:56 -07:00
Travis Ralston
b7d0dd4408 Rename GeneralSettingsTab to GeneralUserSettingsTab 2019-01-28 13:54:56 -07:00
Travis Ralston
c204cd7be3
Merge pull request #2502 from matrix-org/travis/settings/disabled-selects
Override UA/OS styles for disabled Field selects
2019-01-28 10:32:37 -07:00
Travis Ralston
3d59cf996f Icon for flair tab 2019-01-28 10:24:18 -07:00
Bruno Windels
8d1e105b50 add option for whitespace behaviour and handle height 2019-01-28 18:02:36 +01:00
Bruno Windels
88f25dec4d don't over-constraint layout while resizing
adapting the approach taken in the prototype
2019-01-28 17:52:46 +01:00
Travis Ralston
6683a9989a
Merge pull request #2504 from matrix-org/travis/settings/positive
Be more positive with setting labels
2019-01-28 09:00:52 -07:00
David Baker
2d61a2508d
Merge pull request #2514 from matrix-org/bwindels/roomlistjslayout-bis
Redesign: new roomlist layout fixes
2019-01-28 15:53:28 +00:00
Bruno Windels
b0bb4eb5ab better naming 2019-01-28 16:30:34 +01:00
Bruno Windels
d833174d68 floor default section height 2019-01-28 16:29:34 +01:00
Travis Ralston
a1e3887a74
Merge branch 'experimental' into travis/settings/positive 2019-01-28 08:25:40 -07:00
Bruno Windels
6e55ebdab7 better naming for anchor 2019-01-28 16:10:50 +01:00
Bruno Windels
dab1f30ab4 remove obsolete logging and comments 2019-01-28 16:08:38 +01:00
Bruno Windels
79a44b1bfb always hide overflow on RoomList in case Layout screws up 2019-01-28 16:03:49 +01:00
Bruno Windels
87720bac2e add comments to fields 2019-01-28 16:03:08 +01:00
Bruno Windels
d56f77debe ignore updates that don't change anything 2019-01-28 16:02:56 +01:00
Bruno Windels
14485b60be assign default height after assigning new sections
also apply it to sections with value null
2019-01-28 16:00:28 +01:00
Bruno Windels
55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout
Redesign: new layout algorithm for room sublists.
2019-01-28 14:55:31 +00: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
Bruno Windels
eaf212dd89 fix lint - bis bis 2019-01-28 15:28:56 +01:00
Bruno Windels
f103e60d1d fix lint - bis 2019-01-28 15:22:05 +01:00
Bruno Windels
d08216e857 fix lint 2019-01-28 14:56:14 +01:00
Bruno Windels
bfb1031a6b unify heights stored by id and index, to avoid them getting out of sync
effectively get rid of _originalHeights and calculate the array
from the dictionary when needed
2019-01-28 14:52:40 +01:00
Bruno Windels
0a5e8e6cfe WIP on persisting height across collapse/expand 2019-01-28 14:35:04 +01: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
e2ba1cc0d6 Remove unused import 2019-01-25 15:46:38 -07:00