PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
13294 commits 1 branch 0 tags 338 MiB
Commit graph

13294 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
d34390d230
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair 
Implement flair tab in user settings
 2019-01-28 20:37:22 -07:00
Travis Ralston
70b34aa2c3 Condense CSS rules and use box-sizing instead of math 2019-01-28 20:26:03 -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
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
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
Bruno Windels
cb9ebf8b8b rerender roomlist when banner gets shown/hidden, to update the layout 2019-01-25 18:47:57 +01:00
Bruno Windels
8ffeee6a98 add matthews new resize algo 2019-01-25 18:47:34 +01: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
Travis Ralston
e1bc1eee43 Appease the linter 2019-01-25 09:30:13 -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
aeac82209e Improve disabled Field styling 2019-01-25 09:10:16 -07:00