mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 22:41:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
38552 commits 219 branches 562 tags 474 MiB
Commit graph

1320 commits

Author SHA1 Message Date
Michael Telatynski
02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
videogame hacker
d323bc4c07 Fix Notifications settings view when threepids is undefined 
Signed-off-by: Charlotte Som <half-kh-hacker@hackery.site>
 2021-09-22 13:17:49 +01:00
Šimon Brandner
8bbaf642bf
Avoid self = this 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 08:11:26 +02:00
Šimon Brandner
7f8c0e99ea
Merge remote-tracking branch 'upstream/develop' into task/settings-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 19:35:42 +02:00
Dariusz Niemczyk
2d1d42b90e
Globally replace all console.logs via codemod (#6827) 
This commit replaces all the `console.log` to `logger.log` via an automated script.
Related: vector-im/element-web#18425
 2021-09-21 09:48:09 -06:00
Šimon Brandner
0bae01c824
Convert SecureBackupPanel to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 15:10:23 +02:00
Šimon Brandner
9051df45c1
Convert ChangePassword to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 15:00:08 +02:00
Šimon Brandner
073eff4c71
Convert SecurityUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:59:29 +02:00
Šimon Brandner
222427dae8
Convert GeneralUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:45:38 +02:00
Šimon Brandner
e88227dac8
Convert LabsUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:19:13 +02:00
Šimon Brandner
f62e0795f0
Convert NotificationsSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:51:47 +02:00
Šimon Brandner
c5a1de961b
Convert GeneralRoomSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:44:40 +02:00
Šimon Brandner
76f8543c22
Convert PhoneNumber to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:40:32 +02:00
Šimon Brandner
2ebbda482d
Convert EmailAddress to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:33:11 +02:00
Šimon Brandner
39f92c4ddc
Convert PhoneNumbers to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:14 +02:00
Šimon Brandner
a2ecf18096
Convert EmailAddresses to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:07 +02:00
Šimon Brandner
24df63abd7
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 09:09:21 +02:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Michael Telatynski
d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Travis Ralston
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776 
Render guest settings only in public rooms/spaces
 2021-09-09 10:42:38 -06:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-09-09 11:01:11 +01:00
Michael Telatynski
2eb64de508 Tweak edge case behaviour 2021-09-09 10:54:31 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael Telatynski
83912daced Improve the upgrade for restricted user experience 2021-09-08 13:16:31 +01:00
Michael Telatynski
93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Germain Souquet
3c36b3c2c0 Fix ProfileSettings when avatarUrl is null 2021-09-03 12:50:42 +01:00
Germain Souquet
475ef66c58 Fix state initialisation for DevicesPanel 2021-09-03 10:25:45 +01:00
Germain
e16921e1f1
Merge pull request #6619 from matrix-org/gsouquet/ts-components-migration 2021-09-03 08:47:12 +01:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split 
Split autoplay GIFs and videos into different settings
 2021-09-02 18:40:42 +02:00
Šimon Brandner
9b2c380b64
Split autoplay gifs and videos in to different settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-01 17:28:15 +02:00
Michael Telatynski
979bc71609 Deduplicate join rule management between rooms and spaces 2021-09-01 15:52:56 +01:00
Germain Souquet
ae16695713 Fix Apache copyright headers 2021-09-01 10:19:25 +01:00
Germain Souquet
8b567944ec Merge branch 'develop' into gsouquet/ts-components-migration 2021-09-01 08:40:48 +01:00
Steffen Kolmer
21cf3592cf Update props and state interfaces 2021-08-27 19:32:38 +02:00
Steffen Kolmer
6e30673164 Show spinner if user id is missing in event tile preview 2021-08-27 19:23:26 +02:00
Šimon Brandner
c353b6daad
Render guest settings only in public rooms 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-26 17:39:48 +02:00
J. Ryan Stinnett
d013ae79b7 Fix changelog link colour back to blue 
https://github.com/matrix-org/matrix-react-sdk/pull/5698 changed all dialog
links to green, which is not expected. In general, we use blue links for
information and green links for actions.

This resolves the regression by removing the general change and adjusting the
new links added by the above PR to be green as desired there.

Fixes https://github.com/vector-im/element-web/issues/18726
 2021-08-26 13:59:12 +01:00
Germain Souquet
cb8e62c0b2 human linter and copyright fixer 2021-08-26 08:02:36 +01:00
Germain Souquet
e1e0278190 Update js-sdk imports to target individual files 2021-08-25 10:04:54 +01:00
Germain Souquet
450140befd Fix linting issues 2021-08-25 09:34:16 +01:00