Commit graph

14121 commits

Author SHA1 Message Date
RiotRobot
8d77b2a15a Reset matrix-js-sdk back to develop branch 2024-10-08 12:37:43 +00:00
RiotRobot
7cb80d560d Reset matrix-react-sdk back to develop branch 2024-10-08 12:37:34 +00:00
RiotRobot
b318c40f4d Merge branch 'master' into develop 2024-10-08 12:37:22 +00:00
RiotRobot
46d6935517 v1.11.80 2024-10-08 12:34:40 +00:00
RiotRobot
097506f0c1 Upgrade dependency to matrix-react-sdk@3.112.0 2024-10-08 12:31:52 +00:00
RiotRobot
b5944e2eeb Upgrade dependency to matrix-js-sdk@34.7.0 2024-10-08 12:24:10 +00:00
Michael Telatynski
8720a7cef7
Merge pull request #28152 from element-hq/t3chguy/remove-hmr
Remove broken HMR support
2024-10-08 09:39:24 +00:00
Michael Telatynski
2a33d553e4
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-08 10:28:51 +01:00
Michael Telatynski
36285699ac
Remove more bits surrounding hmr
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-04 14:12:08 +01:00
Michael Telatynski
1691468145
Merge pull request #28151 from element-hq/t3chguy/dedup-icons-2
Update prefetch composer icons to Compound
2024-10-04 12:42:21 +00:00
Michael Telatynski
9407af0bfb
Remove broken HMR support
It has been broken since the Webpack 5 upgrade

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-04 13:41:25 +01:00
Michael Telatynski
c65da80f51
Update prefetch composer icons to Compound
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-04 13:08:36 +01:00
David Baker
00a9bb3f0e
Merge pull request #28148 from AndrewKvalheim/help_encrption_url
Correct typo in option documentation
2024-10-04 09:07:08 +00:00
Andrew Kvalheim
6a797684db Correct typo in option documentation
Signed-off-by: Andrew Kvalheim <andrew@kvalhe.im>
2024-10-03 16:30:25 -07:00
Michael Telatynski
36c80099fb
Merge pull request #28129 from element-hq/t3chguy/remove-legacy-header
Remove legacy room header
2024-10-02 12:11:00 +00:00
Michael Telatynski
07ce53ce99
Merge branch 'develop' into t3chguy/remove-legacy-header 2024-10-02 11:24:43 +01:00
David Baker
50871f6973
Merge pull request #28135 from element-hq/renovate/docker
Update docker/build-push-action digest to 4f58ea7
2024-10-01 19:54:18 +00:00
renovate[bot]
013086cbaf
Update docker/build-push-action digest to 4f58ea7 2024-10-01 19:09:55 +00:00
RiotRobot
aa3096ab79 v1.11.80-rc.0 2024-10-01 15:17:28 +00:00
RiotRobot
c44555cdf0 Upgrade dependency to matrix-react-sdk@3.112.0-rc.0 2024-10-01 15:08:37 +00:00
RiotRobot
60cf3ce192 Upgrade dependency to matrix-js-sdk@34.7.0-rc.0 2024-10-01 14:56:42 +00:00
David Baker
ebd632cf47 Merge remote-tracking branch 'origin/staging' into develop 2024-10-01 15:21:47 +01:00
David Baker
3f1a32105a
Merge pull request #28130 from element-hq/dbkr/branch_cut_debug_2
Separate out tasks for each merge in the Prepare Release script
2024-10-01 13:37:29 +00:00
David Baker
42be67e57a Just run the git setup once 2024-10-01 14:06:03 +01:00
David Baker
350b84a159 Separate out tasks for each merge in the Prepare Release script
So it's easier to see which one failed.
2024-10-01 13:54:32 +01:00
RiotRobot
ec60099105 v1.11.79 2024-10-01 12:03:22 +00:00
RiotRobot
14dc9a0418 Upgrade dependency to matrix-react-sdk@3.111.0 2024-10-01 11:59:43 +00:00
Robin
d282416ea6 Update docs to reflect that you can join calls without the labs flags 2024-10-01 10:48:08 +01:00
Michael Telatynski
3baba1da65
Remove legacy room header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-01 10:06:24 +01:00
Robin
e428a1eb53
Merge pull request #28113 from robintown/delabs-join-calls
Update docs to reflect that you can join calls without the labs flags
2024-09-30 13:37:05 +00:00
R Midhun Suresh
1c0b04a3a5
Merge pull request #28124 from element-hq/midhun/remove-message-pinning-from-action
Don't add `labs` label for `A-Message-Pinning`
2024-09-30 13:15:08 +00:00
R Midhun Suresh
34c80bb785
Message pinning is no longer a labs feature
So remove it from this action
2024-09-30 18:17:41 +05:30
Robin
de02f04395 Update docs to reflect that you can join calls without the labs flags 2024-09-27 14:06:50 -04:00
Florian Duros
1b31e7f67b
Merge pull request #28079 from element-hq/renovate/typescript
Update dependency typescript to v5.6.2
2024-09-26 15:07:00 +00:00
Florian Duros
e0ab0cfa4e
Merge remote-tracking branch 'origin/renovate/typescript' into renovate/typescript
# Conflicts:
#	yarn.lock
2024-09-26 16:56:14 +02:00
Florian Duros
53bbe891eb
Fix react types 2024-09-26 16:55:46 +02:00
renovate[bot]
7721c9e410
Update dependency typescript to v5.6.2 2024-09-26 14:42:40 +00:00
Richard van der Hoff
63c1ba07e8
Merge pull request #28101 from element-hq/rav/no_element_r_issues
Stop adding Element-R issues to the Crypto team board
2024-09-25 12:20:06 +00:00
Richard van der Hoff
7475c507aa Stop adding Element-R issues to the Crypto team board
Now that Element-R is universal, issues affecting Element-R are just
"issues". As such, it's no longer appropriate to add these to the Crypto team
board.
2024-09-25 11:28:20 +01:00
Michael Telatynski
861ac3b50c
Merge pull request #28096 from element-hq/t3chguy/fix/d1889
Update native OIDC callback url to be RFC8252 compliant
2024-09-25 10:08:49 +00:00
Michael Telatynski
994fcd6319
Update native OIDC callback url to be RFC8252 compliant
By switching the double slash for a single one

Fixes https://github.com/element-hq/element-desktop/issues/1889

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-09-24 16:56:08 +01:00
RiotRobot
11d70feb90 Reset matrix-js-sdk back to develop branch 2024-09-24 12:53:07 +00:00
RiotRobot
fed93f5759 Reset matrix-react-sdk back to develop branch 2024-09-24 12:52:57 +00:00
RiotRobot
95b981a203 Merge branch 'master' into develop 2024-09-24 12:52:41 +00:00
RiotRobot
8b7dafffc9 v1.11.78 2024-09-24 12:49:41 +00:00
RiotRobot
8fa6acd0f0 Upgrade dependency to matrix-react-sdk@3.110.0 2024-09-24 12:46:21 +00:00
RiotRobot
e92d75b4fd Upgrade dependency to matrix-js-sdk@34.6.0 2024-09-24 12:39:34 +00:00
Florian Duros
787feca6a4
Merge pull request #28075 from element-hq/renovate/definitelytyped
Update dependency @types/node to v16.18.108
2024-09-23 14:10:54 +00:00
renovate[bot]
42b6703f9f
Update dependency @types/node to v16.18.108 2024-09-23 13:49:14 +00:00
renovate[bot]
1bbe4c3fbc
Merge pull request #28076 from element-hq/renovate/react-types
Update dependency @types/react to v17.0.82
2024-09-23 10:21:14 +00:00