Commit Graph

69 Commits (6a29cd33c13c69492f3c703a49d5599c39b33a05)

Author SHA1 Message Date
Michael Telatynski 48aa203b95 Notify left panel of resizing when it is collapsed&expanded
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 06:05:53 +01:00
Bruno Windels 4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski 3060cdf934 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:01:50 +01:00
Michael Telatynski 5bee948717 Fix room tile context menu for Historical rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:35:03 +01:00
J. Ryan Stinnett 9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett 5f78522681 Move the default brand into the config module 2020-07-10 19:57:01 +01:00
Michael Telatynski 6042e015e0 Remove unused dispatches view_indexed_room and view_prev_room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 17:49:37 +01:00
J. Ryan Stinnett 209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01:00
J. Ryan Stinnett b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski b2b909aa53 Including start_sso and start_cas in redirect loop prevention
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 15:40:20 +01:00
Michael Telatynski 113dfc5ed2
Merge pull request #4845 from matrix-org/t3chguy/hf1
ts-ignore because something is made of fail
2020-06-26 10:10:18 +01:00
Michael Telatynski a905028d3a bandaid
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 09:37:55 +01:00
Michael Telatynski 274e6f3825 make js-sdk import happy?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 09:35:29 +01:00
Michael Telatynski 9391d151f3 ts-ignore because something is made of fail
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 09:15:02 +01:00
Michael Telatynski 538c853149
Merge pull request #4838 from matrix-org/t3chguy/hf1
Fix Welcome.html CAS and SSO URLs not working
2020-06-26 09:09:39 +01:00
Michael Telatynski 6116cfc2b9 js-sdk imports suck
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 23:52:32 +01:00
Michael Telatynski 29b0505bdb Welcome no longer needs any props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 22:02:39 +01:00
Michael Telatynski c65ccbcacf Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 22:00:22 +01:00
Michael Telatynski 61618d5162 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 15:02:52 +01:00
David Baker 3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Jorik Schellekens 05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
David Baker 3d1ec9effb
typo
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-15 12:59:38 +01:00
David Baker a75dfca73e Comment on when we start waiting for the first sync 2020-06-15 12:11:45 +01:00
David Baker 404798d27c Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-15 11:36:39 +01:00
Travis Ralston 5114c37b82 Add filtering and exploring to the new room list
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
2020-06-08 20:33:21 -06:00
Travis Ralston de18af35ff Support minimum to open user settings to a particular tab
Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
2020-06-08 08:20:15 -06:00
David Baker ed7f0fd95f This promise doesn't exist anymore 2020-06-05 18:08:25 +01:00
David Baker 7c59e39710 Sort out what we wait for after login
We were waiting only for the client to become logged in rather than
for setLoggedIn() to finish but then we were waiting for the first
sync to complete which is far longer. We need setLoggedIn to have
finished for crypto to be set up so we can query cross-signing keys,
so just wait for that anyway, the logic becomes a lot simpler and
we're waiting the same amount of time because we have to wait for
the first sync to finish. We can also download keys in parallel.
2020-06-05 17:52:09 +01:00
David Baker 68e555a0c6 Support accounts with cross signing but no SSSS
At least at the login stage.

Fixes https://github.com/vector-im/riot-web/issues/13894
2020-06-05 16:40:20 +01:00
Travis Ralston dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06: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
David Baker ddcd3fb806 Fix the 'complete security' screen
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).

NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894) but we should
put this back the way it was in the meantime.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
2020-06-03 14:31:34 +01:00
Michael Telatynski 653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing
Remove feature_cross_signing
2020-06-03 10:42:13 +01:00
Travis Ralston 1f1f613777 Add a focus_composer dispatcher action
and use it
2020-06-02 19:07:46 -06:00
Michael Telatynski 113a9d71b5 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-02 16:26:07 +01:00
Michael Telatynski efd0da44a1 Give contextual feedback for manual update check instead of banner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 18:24:45 +01:00
Michael Telatynski 2530ec8419 Try and fix the Notifier race
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 19:03:42 +01:00
Michael Telatynski 0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
Migrate Banners to Toasts
2020-05-28 18:21:28 +01:00
Jorik Schellekens 81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Michael Telatynski 48de174576 remove debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:20:20 +01:00
Michael Telatynski efa47f1a8e Change out debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:02:51 +01:00
Michael Telatynski cc68f53fc2 tidy up and delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:47:01 +01:00
Michael Telatynski 2b432b0d82 Remove feature_cross_signing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:28:25 +01:00
Michael Telatynski c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
David Baker a496dafd41 Remove the keyshare dialog
Fixes https://github.com/vector-im/riot-web/issues/11908
2020-05-26 16:51:20 +01:00
Michael Telatynski c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
2020-05-26 13:38:17 +01:00
Michael Telatynski c372e8edee fix viewGroup to actually show the group if possible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 11:29:56 +01:00
Michael Telatynski 4193426808 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 23:14:33 +01:00
Michael Telatynski 891ba1bbe3 Replace New Version Bar with a Toast
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 23:08:45 +01:00
Michael Telatynski c91f8c2631 Migrate Analytics Banner to a Toast
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 22:04:21 +01:00