Commit graph

34547 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
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
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
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
Germain Souquet
aac0989005 Make beta dot animation run on the compositor 2021-07-02 14:58:59 +01:00
Michael Telatynski
b17d72c399 fix duplicate import 2021-07-02 14:54:10 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski
fb149c4ea2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-02 09:06:19 +01:00
David Baker
780c413b5d
Merge pull request #6306 from matrix-org/dbkr/ts_semicolons
Comply with new member-delimiter-style rule
2021-07-01 23:53:57 +01:00
David Baker
1fe0c2ab88 Bump eslint plugin version 2021-07-01 23:45:08 +01:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
David Baker
bd470f8897
Merge pull request #6304 from matrix-org/dbkr/tests_lint
Fix Test Linting
2021-07-01 23:20:45 +01:00
David Baker
6aa0a4428e Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 23:11:43 +01:00
David Baker
f96553615e
Merge pull request #6303 from matrix-org/dbkr/tsify_markdown
Convert Markdown to TypeScript
2021-07-01 23:09:27 +01:00
David Baker
fda17b4959
Add types to the implementations too
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 23:02:51 +01:00
Michael Telatynski
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
David Baker
08176beb58 Kill mock-clock
We already import sinon's one in UserActivitytest, so use that here too.
2021-07-01 21:52:15 +01:00
David Baker
536e3aadd7 Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 21:39:17 +01:00
David Baker
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader
Convert RoomHeader to TS
2021-07-01 21:33:11 +01:00
David Baker
c1310bcd9f Better types 2021-07-01 21:31:17 +01:00
Michael Telatynski
c2545923c1 Use better types to make CI happy 2021-07-01 21:10:37 +01:00