OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,567 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

34567 Commits (894bce7813c4dee78e951ed5397c9d61e9f8538e)

Author SHA1 Message Date
Germain Souquet 894bce7813 Update lockfile 2021-07-06 14:54:06 +02:00
Germain Souquet a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Michael Telatynski d004163177 Fix 2 new NPEs 2021-07-06 12:05:30 +01:00
Michael Telatynski 06284fe73d Update e2e tests 2021-07-06 12:05:06 +01:00
Germain 7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Michael Telatynski 04c923bd75 fix tests by including client field on the Room stub and stubbing getJoinedMemberCount 2021-07-06 11:35:56 +01:00
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
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
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
David Baker 9bb4e4ca4a
Merge pull request #6312 from matrix-org/dbkr/my_icon_is_too_big 
Fix icon size in passphrase prompt
 2021-07-02 20:56:59 +01:00
David Baker 0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Michael Telatynski 89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Germain Souquet df64a076d9 Deprecate unused PulsedAvatar 2021-07-02 15:24:30 +01:00
Germain Souquet a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Michael Telatynski 912e192dc6 Tweak behaviour of setting restricted join rule 2021-07-02 15:18:27 +01:00
Michael Telatynski 3287d3dd53
Merge pull request #6305 from matrix-org/t3chguy/ts/11 2021-07-02 15:08:53 +01:00