Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 779e43b

Browse files
authored
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
Convert auth lifecycle to TS, remove dead ILAG code
2 parents 0b443c5 + 28e4580 commit 779e43b

File tree

17 files changed

+235
-1045
lines changed

17 files changed

+235
-1045
lines changed

.eslintignore.errorfiles

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,31 @@
11
# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
22

3+
src/ImageUtils.js
4+
src/Markdown.js
5+
src/Rooms.js
6+
src/Unread.js
7+
src/Velociraptor.js
38
src/components/structures/RoomDirectory.js
4-
src/components/structures/RoomStatusBar.js
59
src/components/structures/ScrollPanel.js
6-
src/components/structures/SearchBox.js
710
src/components/structures/UploadBar.js
8-
src/components/views/avatars/MemberAvatar.js
9-
src/components/views/create_room/RoomAlias.js
10-
src/components/views/dialogs/SetPasswordDialog.js
1111
src/components/views/elements/AddressSelector.js
1212
src/components/views/elements/DirectorySearchBox.js
13-
src/components/views/elements/MemberEventListSummary.js
14-
src/components/views/elements/UserSelector.js
15-
src/components/views/globals/NewVersionBar.js
1613
src/components/views/messages/MFileBody.js
1714
src/components/views/messages/TextualBody.js
18-
src/components/views/room_settings/ColorSettings.js
19-
src/components/views/rooms/Autocomplete.js
2015
src/components/views/rooms/AuxPanel.js
2116
src/components/views/rooms/LinkPreviewWidget.js
22-
src/components/views/rooms/MemberInfo.js
2317
src/components/views/rooms/MemberList.js
24-
src/components/views/rooms/RoomList.js
2518
src/components/views/rooms/RoomPreviewBar.js
26-
src/components/views/rooms/SearchResultTile.js
2719
src/components/views/settings/ChangeAvatar.js
28-
src/components/views/settings/ChangePassword.js
2920
src/components/views/settings/DevicesPanel.js
3021
src/components/views/settings/Notifications.js
31-
src/HtmlUtils.js
32-
src/ImageUtils.js
33-
src/Markdown.js
34-
src/notifications/ContentRules.js
35-
src/notifications/PushRuleVectorState.js
36-
src/PlatformPeg.js
3722
src/rageshake/rageshake.js
3823
src/ratelimitedfunc.js
39-
src/Rooms.js
40-
src/Unread.js
24+
src/utils/DMRoomMap.js
4125
src/utils/DecryptFile.js
4226
src/utils/DirectoryUtils.js
43-
src/utils/DMRoomMap.js
44-
src/utils/FormattingUtils.js
4527
src/utils/MultiInviter.js
4628
src/utils/Receipt.js
47-
src/Velociraptor.js
4829
test/components/structures/MessagePanel-test.js
4930
test/components/views/dialogs/InteractiveAuthDialog-test.js
5031
test/mock-clock.js

res/css/_components.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
@import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
8282
@import "./views/dialogs/_ServerOfflineDialog.scss";
8383
@import "./views/dialogs/_SetEmailDialog.scss";
84-
@import "./views/dialogs/_SetMxIdDialog.scss";
85-
@import "./views/dialogs/_SetPasswordDialog.scss";
8684
@import "./views/dialogs/_SettingsDialog.scss";
8785
@import "./views/dialogs/_ShareDialog.scss";
8886
@import "./views/dialogs/_SlashCommandHelpDialog.scss";

res/css/views/dialogs/_SetMxIdDialog.scss

Lines changed: 0 additions & 50 deletions
This file was deleted.

res/css/views/dialogs/_SetPasswordDialog.scss

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)