enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
42,834 Commits 1 Branch 7 Tags
7a80ea4bbe95adec14abc79a5bb8206cda170e61
Commit Graph

12860 Commits

Author SHA1 Message Date
Michael Telatynski bd0a96f2b2 Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining 
 Conflicts:
	src/components/views/elements/Pill.js
 2020-01-06 09:35:59 +00:00
Michael Telatynski ac1d9b03bf undo one of the "fixes" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 09:35:14 +00:00
Michael Telatynski 64754a3f88 Add comment and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:18:24 +00:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Travis Ralston 781b69f4e3 Merge pull request #3693 from matrix-org/hs/bridge-info 
Bridge info settings tab
 2020-01-05 17:03:15 -07:00
Will Hunt 7f0ed05ee1 Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Michael Telatynski 4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski 378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Michael Telatynski b6098ddb47 Delegate all room alias validation to the RoomAliasField validator 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 21:58:36 +00:00
Michael Telatynski ba2f4aa973 tidy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 21:26:32 +00:00
Michael Telatynski cf071c5ac6 Deduplicate recent emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 21:23:34 +00:00
Michael Telatynski 4118faa834 When looking at a MemberInfo, clicking on MemberList should close not switch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 20:31:07 +00:00
Michael Telatynski fb754b795c Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 20:30:01 +00:00
Will Hunt 2ccc8caa69 Fix indent 2020-01-05 15:50:06 +00:00
Michael Telatynski 295dcbfe48 Fix ability to remove avatars 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-04 13:34:05 +00:00
Travis Ralston 8b4c1e3dec Support searching in the user directory for invite targets 
Part of https://github.com/vector-im/riot-web/issues/11200
 2020-01-03 21:22:06 -07:00
Travis Ralston df25a98810 Implement basic filtering for invite targets 
Part of https://github.com/vector-im/riot-web/issues/11200
 2020-01-03 21:22:06 -07:00
Travis Ralston 31d5617c97 Add suggestions for which users to invite to chat 
Fixes https://github.com/vector-im/riot-web/issues/11198

Note this doesn't implement the entire algorithm in 11198 because it feels too complicated at this stage. Instead, the idea is to review the suggestions closer to when the whole dialog is complete and fix them then: https://github.com/vector-im/riot-web/issues/11769

Algorithm for picking members is largely based on https://github.com/matrix-org/matrix-react-sdk/commit/db5218e19a26b650d4af37de81f516c68ab7e9b8
 2020-01-03 19:41:06 -07:00
Travis Ralston 9edc361afc Use new imports for js-sdk's ContentRepo 
Per https://github.com/matrix-org/matrix-js-sdk/pull/1134/commits/f4d1c5c006027962cd18dffb3f7c521d9e24e831
 2020-01-03 12:29:22 -07:00
Travis Ralston 65954b1e1b Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial 
Initial implementation of FTUE user lists design
 2020-01-03 10:32:24 -07:00
Travis Ralston 752482964a Purify the components 2020-01-03 10:24:07 -07:00
J. Ryan Stinnett 76f3a08909 Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
J. Ryan Stinnett e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker 2125bcf5a6 Comment remaining non-cross-signing-compliant components 
Fixes https://github.com/vector-im/riot-web/issues/11748
 2020-01-03 15:38:59 +00:00
J. Ryan Stinnett b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
David Baker 5897c8ca7f Remove 'unverify' from UserInfoPanel 
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
 2020-01-03 15:00:51 +00:00
Half-Shot 50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot 668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
J. Ryan Stinnett 4211ec5063 Fix DOM structure in RoomRecoveryReminder 
Buttons (which end up as <div>s) aren't allowed inside <p>s.
 2020-01-03 13:51:45 +00:00
David Baker 43e4f2dcc0 Use deviceTrust when displaying key backup trust status 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
 2020-01-03 13:34:43 +00:00
J. Ryan Stinnett 99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
Bruno Windels 7a88a94936 fixes! 2020-01-03 13:50:13 +01:00
Bruno Windels 52c7c5b837 render done tile as accepted 2020-01-03 13:50:13 +01:00
Bruno Windels b49c471f05 render empty tiles when no request 2020-01-03 13:50:13 +01:00
Bruno Windels 075e42c076 use transactionId as key for react 2020-01-03 13:50:13 +01:00
Bruno Windels de1c3e2f83 use same style as UserInfo for sections and paragraphs 2020-01-03 13:50:13 +01:00
Bruno Windels 2dd1e93d84 show message after clicking "they match" 2020-01-03 13:50:13 +01:00
Bruno Windels dd633bd8fe port toast to use VerificationRequest and open right panel, not dialog 2020-01-03 13:50:13 +01:00
Bruno Windels 1aebc95793 slightly better copy 2020-01-03 13:50:13 +01:00
Bruno Windels f4a276c052 port MVerificationConclusion to use VerificationRequest 2020-01-03 13:50:13 +01:00
Bruno Windels d57e76f3e2 hide verify button for own member 2020-01-03 13:50:13 +01:00
Bruno Windels 8c5f3d6d94 show devices and unverify action also in unencrypted rooms 2020-01-03 13:48:35 +01:00
Bruno Windels b80bfd04b2 make sure to have roomId of DM when starting verif. req. 2020-01-03 13:47:38 +01:00
Bruno Windels b866c16071 show cancellation 2020-01-03 13:47:38 +01:00
Bruno Windels db17321777 await verify so errors (like cancellation) are caught 2020-01-03 13:47:38 +01:00
Bruno Windels 2c28fa0568 use verif in right panel from "verify" button 2020-01-03 13:47:38 +01:00
Bruno Windels 9e4b65de6a fixup after rebase 2020-01-03 13:42:18 +01:00
Bruno Windels 0f415038be actually start verify process in verification panel 
temporary code, as ux is not complete
 2020-01-03 13:42:18 +01:00
Bruno Windels c02fc44d25 WIP sas in right panel 2020-01-03 13:42:17 +01:00
Bruno Windels d8a38e6b74 WIP 2020-01-03 13:42:17 +01:00