Commit graph

25095 commits

Author SHA1 Message Date
Travis Ralston
51038b0c02 Replace math hacks with temporary placeholder 2020-06-05 11:03:18 -06:00
Travis Ralston
1f11298aa3 Annotate hacky math 2020-06-04 21:45:32 -06:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
0694637b06 Remove debug 2020-06-04 21:38:06 -06:00
Travis Ralston
f347019cf8 Remove obviously questionable color choices 2020-06-04 21:37:10 -06:00
Travis Ralston
434f6ea4d4 Remove legacy sublist sizing 2020-06-04 16:36:14 -06:00
Travis Ralston
2fe56276f2 css for vis 2020-06-04 10:07:41 -06:00
Travis Ralston
a3fdd643d7 Add hacky math support 2020-06-04 09:57:16 -06:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9 Try variable resizing 2020-06-04 09:19:03 -06:00
RiotRobot
3c73930e9a Reset matrix-js-sdk back to develop branch 2020-06-04 15:14:34 +01:00
RiotRobot
260d448db6 Merge branch 'master' into develop 2020-06-04 15:13:41 +01:00
RiotRobot
65e59fd708 v2.7.0 2020-06-04 15:12:24 +01:00
RiotRobot
5aff8f7915 Prepare changelog for v2.7.0 2020-06-04 15:12:23 +01:00
RiotRobot
07a12a73ee Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:06:40 +01:00
Michael Telatynski
920e087ada
Merge pull request #4704 from matrix-org/t3chguy/continuation
Tidy up continuation algorithm and make it work for hidden profile changes
2020-06-04 13:59:13 +01:00
Michael Telatynski
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname
Profile settings should never show a disambiguated display name
2020-06-04 13:50:15 +01:00
Bruno Windels
737c31a54c
Merge pull request #4703 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore-rc
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
2020-06-04 12:37:48 +00:00
Michael Telatynski
6d81337d92 Tidy up continuation algorithm and make it work for hidden profile change events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 13:10:45 +01:00
Bruno Windels
77b012e49b
Merge pull request #4701 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
2020-06-04 12:07:19 +00:00
Bruno Windels
40cabd2589 When trying to restore a keyback that has its key in 4S, check if 4S will be readable
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 14:03:48 +02:00
J. Ryan Stinnett
4e623fa8c0
Merge pull request #4702 from matrix-org/jryans/release-4691
Fix checkbox bleed
2020-06-04 12:11:20 +01:00
Jorik Schellekens
ca69a9d7bb Fix checkbox bleed 2020-06-04 12:03:18 +01:00
Bruno Windels
07e0cab4a8 When trying to restore a keyback that has its key in 4S, check if 4S will be readable
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 12:52:20 +02:00
Bruno Windels
aec588dada
Merge pull request #4691 from JorikSchellekens/joriks/fix-addressselector-dropdown-checkbox-overlap
Stop checkbox styling bleeding through room address selector
2020-06-04 09:16:45 +00:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 09:50:19 +01:00
Travis Ralston
30027a6556 Remove debugging 2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06:00
Michael Telatynski
e6a776be7e
Merge pull request #4693 from matrix-org/t3chguy/sso-query
Fix login loop where the sso flow returns to `#/login` to release
2020-06-04 01:09:30 +01:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist
711ddd42c9 Remove some unused images
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist
3b5de137c4 Center HeaderButtons
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:23 -05:00
Michael Telatynski
096045a037 change names of consts for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 22:15:01 +01:00
Michael Telatynski
84d81ff09b Fix login loop where the sso flow returns to #/login
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 22:15:01 +01:00
Michael Telatynski
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault
Add .well-known option to control default e2ee behaviour
2020-06-03 22:12:13 +01:00
Matthew Hodgson
b368856f2b
Merge pull request #4692 from aaronraimist/panel-max-width
Add max-width to right and left panels
2020-06-03 21:09:05 +01:00
Aaron Raimist
92c28f089c
Add max-width to right and left panels
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 14:56:48 -05:00
Michael Telatynski
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query
Fix login loop where the sso flow returns to `#/login`
2020-06-03 20:28:01 +01:00
Michael Telatynski
5b775fd63c
Merge pull request #4690 from matrix-org/t3chguy/mau-toasts
Don't clear MAU toasts when a successful sync comes in
2020-06-03 20:23:25 +01:00
Michael Telatynski
899f9ede45 change names of consts for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:23:01 +01:00
Travis Ralston
380ba163e4
Merge pull request #4681 from matrix-org/travis/room-list/filtering
Add initial filtering support to new room list
2020-06-03 13:21:13 -06:00
Michael Telatynski
5a4723d243 don't specify hs_disabled as its a Synapse special
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:13:32 +01:00
Travis Ralston
bc2fbefb5c Remove iteratorToArray 2020-06-03 11:29:06 -06:00
Travis Ralston
013751e308
Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications
Bubble up a decline-to-render of verification events to outside wrapper
2020-06-03 10:10:06 -06:00
Michael Telatynski
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13
upgrade to twemoji 13.0.0
2020-06-03 17:09:32 +01:00
Jorik Schellekens
5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Michael Telatynski
9c417cfbad Don't clear MAU toasts when a successful sync comes in
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 16:17:31 +01:00