From 042954a2261d5341dbbe62f0515cda682696e99f Mon Sep 17 00:00:00 2001 From: "marc.sirisak" Date: Thu, 2 May 2024 11:40:42 +0200 Subject: [PATCH] Bump to 4.5.2 --- README_tchap.md | 14 +++----------- package.json | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/README_tchap.md b/README_tchap.md index febcbc7181..24a3e7aba7 100644 --- a/README_tchap.md +++ b/README_tchap.md @@ -3,7 +3,8 @@ - modules -> used for translation - linked-dependencies -> subtree dependencies used for matrix-react-sdk - yarn-linked-dependencies -> legacy dependencies used for matrix-js-sdk -- patches -> legacy patches directory in which code for the patches where put +- patches_legacy -> legacy patches directory in which code for the patches where put +- patches -> used for matrix-js-sdk patches - src -> code ## Local dev installation @@ -37,19 +38,10 @@ This command will take all the commits that touch the subtree repo and push them - In element code : You need to add around your code those comments -``` -// :TCHAP: -...code -// end :TCHAP: -``` - -- In matrix-react-sdk code : - You need to add around your code those comments - ``` // :TCHAP: NAME_OF_THE_PATCH ...code // end :TCHAP: ``` -Then also update the `patches.json` file. eventhough we are not using patches anymore for matrix-react-sdk, we continue to use this file to keep track of the changes we make to the sdk. It will also be easier to separate different functionnality that tchap added to the code +Then also update the `subtree-modifications.json` file. We continue to keep track of the changes we make to the sdk. It will also be easier to separate different functionnality that tchap added to the code diff --git a/package.json b/package.json index d25c8c513b..27e2b2530e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "element-web", "productName": "Tchap", - "version": "4.5.1", + "version": "4.5.2", "version-element-web": "1.11.65", "description": "A feature-rich client for Matrix.org", "author": "DINUM",