Skip to content

Commit

Permalink
Merge pull request #994 from tchapgouv/bump-4.5.2
Browse files Browse the repository at this point in the history
Bump to 4.5.2
  • Loading branch information
MarcWadai authored May 2, 2024
2 parents 64e759f + 042954a commit 740d598
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
14 changes: 3 additions & 11 deletions README_tchap.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 740d598

Please sign in to comment.