imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'aaronraimist/sort-imports' into develop

Browse source
This commit is contained in:
Travis Ralston 2021-12-09 16:03:59 -07:00
commit e4b96cff1f
553 changed files with 1097 additions and 915 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/room_settings/AliasSettings.tsx
View file

@ -16,6 +16,7 @@ limitations under the License.
import React, { ChangeEvent, createRef } from "react";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { logger } from "matrix-js-sdk/src/logger";
import EditableItemList from "../elements/EditableItemList";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
@ -30,8 +31,6 @@ import { replaceableComponent } from "../../../utils/replaceableComponent";
import RoomAliasField from "../elements/RoomAliasField";
import SettingsFieldset from "../settings/SettingsFieldset";
import { logger } from "matrix-js-sdk/src/logger";
interface IEditableAliasesListProps {
domain?: string;
}

4
src/components/views/room_settings/RelatedGroupSettings.js
View file

@ -17,6 +17,8 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
import { logger } from "matrix-js-sdk/src/logger";
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
@ -24,8 +26,6 @@ import ErrorDialog from "../dialogs/ErrorDialog";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { logger } from "matrix-js-sdk/src/logger";
const GROUP_ID_REGEX = /\+\S+:\S+/;
@replaceableComponent("views.room_settings.RelatedGroupSettings")

1
src/components/views/room_settings/RoomProfileSettings.tsx
View file

@ -15,6 +15,7 @@ limitations under the License.
*/
import React, { createRef } from 'react';
import { _t } from "../../../languageHandler";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import Field from "../elements/Field";

3
src/components/views/room_settings/UrlPreviewSettings.tsx
View file

@ -18,6 +18,8 @@ limitations under the License.
*/
import React from 'react';
import { Room } from "matrix-js-sdk/src/models/room";
import { _t, _td } from '../../../languageHandler';
import SettingsStore from "../../../settings/SettingsStore";
import dis from "../../../dispatcher/dispatcher";
@ -25,7 +27,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { Action } from "../../../dispatcher/actions";
import { SettingLevel } from "../../../settings/SettingLevel";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { Room } from "matrix-js-sdk/src/models/room";
import SettingsFlag from "../elements/SettingsFlag";
import SettingsFieldset from '../settings/SettingsFieldset';