OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
13,359 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

13359 Commits (78314ef2849c446ec6b7895f2d41af19bf02e16a)

Author SHA1 Message Date
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
Travis Ralston 57e45e7e7c Proof of concept for a flair tab in user settings 2019-01-25 15:35:32 -07: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
Bruno Windels 2d2f9712b5 update layout on window resize 2019-01-25 18:48:25 +01:00