Commit graph

35846 commits

Author SHA1 Message Date
Michael Telatynski
9d8acd1af0 stub getJoinRule 2021-07-06 10:44:09 +01:00
Michael Telatynski
0ca4a958f7 fix getCapabilities stub 2021-07-06 10:34:50 +01:00
Michael Telatynski
3301763f12 stub getCapabilities in tests 2021-07-06 10:19:33 +01:00
Michael Telatynski
64d1d169cf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-06 10:12:07 +01:00
Michael Telatynski
eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
692347843d Track restricted join rule support in the SpaceStore for sync access 2021-07-06 10:09:35 +01:00
Michael Telatynski
82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Michael Telatynski
44bbf60973 Convert Dropdown to Typescript 2021-07-06 09:56:02 +01:00
RiotRobot
7b4fd161e5 Reset fields for development 2021-07-05 16:27:07 +01:00
RiotRobot
f1b4d72cec Merge branch 'master' into develop 2021-07-05 16:25:02 +01:00
Germain Souquet
de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
RiotRobot
8baa92f2b1 v3.25.0 2021-07-05 15:07:00 +01:00
RiotRobot
24d0906653 Prepare changelog for v3.25.0 2021-07-05 15:06:59 +01:00
RiotRobot
2fa2877aed Upgrade matrix-js-sdk to 12.0.1 2021-07-05 15:00:00 +01:00
David Baker
21f4004af0
Merge pull request #6316 from matrix-org/dbkr/fix-17843-rel
Remove reminescent references to the tinter
2021-07-05 14:46:36 +01:00
Germain Souquet
1551657d56 Remove Tinter reference 2021-07-05 14:36:52 +01:00
Germain Souquet
9999b01c75 Remove reminescent references to the tinter 2021-07-05 14:36:39 +01:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
Germain
1b95762910
Merge pull request #6310 from matrix-org/gsouquet/faster-animations 2021-07-05 12:21:49 +01:00
Germain
47b297c2db
Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet
925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +02:00
Germain Souquet
8d34767768 Fix i18n after deprecation 2021-07-05 09:18:16 +02:00
Germain
92fcfbd8f6
Merge pull request #6313 from robintown/fix-image-rotation
Fix being able to un-rotate images
2021-07-05 07:22:05 +01:00
Priit Jõerüüt
3fe72e4960 Translated using Weblate (Estonian)
Currently translated at 98.1% (2991 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-03 19:35:01 +00:00
Besnik Bleta
929b92ce28 Translated using Weblate (Albanian)
Currently translated at 99.7% (3037 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-07-03 19:34:58 +00:00
LinAGKar
7ca7c0a5c0 Translated using Weblate (Swedish)
Currently translated at 97.9% (2985 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2021-07-03 19:34:55 +00:00
libexus
d559ba1835 Translated using Weblate (German)
Currently translated at 99.4% (3030 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-03 19:34:51 +00:00
Robin Townsend
055f3a72ad Fix being able to un-rotate images
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-03 15:18:47 -04:00
Germain Souquet
b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet
103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet
a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet
b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet
66dde68377 Migrate VectorPushRulesDefinitions to TypeScript 2021-07-03 12:29:13 +01:00
Germain Souquet
d5cebf5e8d Migrate index to TypeScript 2021-07-03 12:22:58 +01:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet
ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +01:00
Germain Souquet
f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
Šimon Brandner
68011056cc
Eleventh and final batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 12:24:07 +02:00
Šimon Brandner
5d054519dc
Tenth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:57:05 +02:00
Šimon Brandner
d99874318c
Ninth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:51:23 +02:00
Šimon Brandner
916589e2b9
Eighth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:24:33 +02:00
Šimon Brandner
6e14c290c8
Seventh batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:59:57 +02:00
Šimon Brandner
914de71e9c
Sixth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:44:03 +02:00
Šimon Brandner
ab4cd9d0fd
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:10:17 +02:00
Šimon Brandner
b7ef7d2a47
Fifth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:06:42 +02:00
Šimon Brandner
6702e68778
Revert some changes due to them breaking tests (and hope it will work now)
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 09:36:18 +02:00