Commit graph

13537 commits

Author SHA1 Message Date
RiotRobot
260e0fc8ac Reset matrix-react-sdk back to develop branch 2023-09-29 11:31:48 +01:00
RiotRobot
6c305121f4 Reset matrix-js-sdk back to develop branch 2023-09-29 11:31:22 +01:00
RiotRobot
b7cca93ceb Merge branch 'master' into develop 2023-09-29 11:30:11 +01:00
RiotRobot
ae98e3a593 v1.11.45 2023-09-29 11:24:44 +01:00
RiotRobot
e4ecf42a8c Prepare changelog for v1.11.45 2023-09-29 11:24:44 +01:00
RiotRobot
c47c598c0b Upgrade matrix-react-sdk to 3.81.1 2023-09-29 11:20:23 +01:00
Johannes Marbach
c844d80217 Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-09-29 11:00:03 +02:00
Johannes Marbach
bb04097912 Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-09-29 10:56:13 +02:00
R Midhun Suresh
47677c8415
Fix broken tsc from localazy changes (#26255) 2023-09-28 14:07:29 +01:00
RiotRobot
1707ecd8b6 Reset matrix-react-sdk back to develop branch 2023-09-26 14:10:03 +01:00
RiotRobot
b4cc35b2da Reset matrix-js-sdk back to develop branch 2023-09-26 14:09:47 +01:00
RiotRobot
8492c22b55 Merge branch 'master' into develop 2023-09-26 14:09:32 +01:00
RiotRobot
e0dc62f7b1 v1.11.44 2023-09-26 14:05:16 +01:00
RiotRobot
d6cf0c7be2 Prepare changelog for v1.11.44 2023-09-26 14:05:16 +01:00
RiotRobot
09291a9cf5 Upgrade matrix-react-sdk to 3.81.0 2023-09-26 13:32:57 +01:00
RiotRobot
9ac837068f Upgrade matrix-js-sdk to 28.2.0 2023-09-26 13:26:28 +01:00
Michael Telatynski
29d5309430
Merge remote-tracking branch 'origin/develop' into develop 2023-09-26 12:28:52 +01:00
Michael Telatynski
7fe11a6026
Make tests happier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-26 12:28:31 +01:00
Michael Telatynski
21f915ffd2
Update tsconfig.json 2023-09-26 09:25:53 +01:00
Johannes Marbach
af3659a90e Update to webpack 5 2023-09-23 21:34:56 +02:00
Johannes Marbach
3d65ff06e9 Fix spaces 2023-09-22 21:03:33 +02:00
Johannes Marbach
e0954f330a Update webpack-dev-server to 4.15.1 2023-09-22 20:57:00 +02:00
renovate[bot]
4367299885
Update jest to v29.5.5 (#26200)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-22 01:00:55 +00:00
renovate[bot]
c59d0a924b
Update babel monorepo to v7.22.20 (#26199)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-22 00:33:54 +00:00
renovate[bot]
8a927e5120
Update SimenB/github-actions-cpu-cores action to v2 (#26203)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-22 01:24:03 +01:00
renovate[bot]
eb40bc940a
Update docker (#26204)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-22 01:23:41 +01:00
Johannes Marbach
218a3b478d Update webpack to 4.47.0 / webpack-cli to 4.10.0 2023-09-21 20:47:58 +02:00
Germain
dcc0f9fbf6
Document feature_notifications_panel labs flag (#25924) 2023-09-20 08:21:37 +01:00
RiotRobot
ce616caf99 v1.11.44-rc.1 2023-09-19 12:51:48 +01:00
RiotRobot
e288bf6ae3 Prepare changelog for v1.11.44-rc.1 2023-09-19 12:51:48 +01:00
RiotRobot
0285eab20c Upgrade matrix-react-sdk to 3.81.0-rc.1 2023-09-19 12:49:42 +01:00
RiotRobot
baacd4ca8c Upgrade matrix-js-sdk to 28.2.0-rc.1 2023-09-19 12:49:19 +01:00
Johannes Marbach
29bd206f85
Merge pull request #26186 from vector-im/johannes/undefault-new-room-header 2023-09-18 12:09:22 +02:00
Johannes Marbach
5d04a2adc3 Turn off new room header by default 2023-09-18 09:47:08 +02:00
Johannes Marbach
df6b106b26
Merge pull request #26089 from vector-im/germain-gg/room-ui-develop 2023-09-15 15:22:32 +02:00
RiotRobot
e456ca1b20 Reset matrix-react-sdk back to develop branch 2023-09-15 12:13:45 +01:00
RiotRobot
744ff5ca9a Reset matrix-js-sdk back to develop branch 2023-09-15 12:13:30 +01:00
RiotRobot
0c0f4cfdbd Merge branch 'master' into develop 2023-09-15 12:13:08 +01:00
RiotRobot
8436c91279 v1.11.43 2023-09-15 12:09:01 +01:00
RiotRobot
c52c62ebc0 Prepare changelog for v1.11.43 2023-09-15 12:09:00 +01:00
Johannes Marbach
1e303652cc
Merge branch 'develop' into germain-gg/room-ui-develop 2023-09-15 09:14:50 +02:00
RiotRobot
361941e5d4 Reset matrix-js-sdk back to develop branch 2023-09-13 13:00:58 +01:00
RiotRobot
dc6c7022fc Merge branch 'master' into develop 2023-09-13 12:59:06 +01:00
RiotRobot
60585cce94 v1.11.42 2023-09-13 12:47:26 +01:00
RiotRobot
3a6a603778 Prepare changelog for v1.11.42 2023-09-13 12:47:25 +01:00
RiotRobot
28a8c1cd1e Upgrade matrix-react-sdk to 3.80.1 2023-09-13 12:44:38 +01:00
ElementRobot
b9be840291 Reset matrix-react-sdk back to develop branch 2023-09-12 17:17:24 +01:00
ElementRobot
81b6320595 Merge branch 'master' into develop
# Conflicts:
#	package.json
#	yarn.lock
2023-09-12 17:16:37 +01:00
ElementRobot
189fa14c29 v1.11.41 2023-09-12 17:12:42 +01:00
ElementRobot
ee254efcf3 Prepare changelog for v1.11.41 2023-09-12 17:12:42 +01:00