Merge branch 'feature/2310' into feature/2295

TryQuiet · Apr 10, 2024 · 3b6ec98 · 3b6ec98
2 parents 7f28330 + 7b5b688
commit 3b6ec98
Show file tree

Hide file tree

Showing 120 changed files with 2,235 additions and 6,956 deletions.
diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
@@ -16,6 +16,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       DISPLAY: ":99.0"
       TEST_MODE: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
@@ -9,6 +9,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
       IS_E2E: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
@@ -11,6 +11,7 @@ jobs:
       ELECTRON_CUSTOM_VERSION: 23.0.0
       TEST_MODE: true
       E2E: true
+      IS_CI: true
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,34 @@
 [unreleased]
 
-# Features:
+# New features:
 
 * Add support for new format of invitation link: `c=<cid>&t=<token>&s=<serverAddress>&i=<inviterAddress>` ([#2310](https://github.com/TryQuiet/quiet/issues/2310))
-* Add utilities for emoji detection in messages and make all-emoji message larger font size ([#519](https://github.com/TryQuiet/quiet/issues/519))
 * Use server for downloading initial community metadata if v2 invitation link is detected ([#2295](https://github.com/TryQuiet/quiet/issues/2295))
 
 # Refactorings:
 
-* Use ack for CREATE_NETWORK and simplify
-
 # Fixes
 
-* Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
+# Chores
 
-# Other:
+* Cleanup data directory at end of e2e tests
+
+[2.2.0]
 
-* Refactored package.json to have consistent license "GPL-3.0-or-later"
+# New features:
+
+* Add utilities for emoji detection in messages and make all-emoji message larger font size ([#519](https://github.com/TryQuiet/quiet/issues/519))
+
+# Refactorings:
+
+* Use ack for CREATE_NETWORK and simplify
+* Move Community model to the backend
+
+# Fixes:
+
+* Allow JPEG and GIF files as profile photos ([#2332](https://github.com/TryQuiet/quiet/issues/2332))
+* Fix issues with recreating general channel when deleted while offline ([#2334](https://github.com/TryQuiet/quiet/issues/2334))
+* Fix package.json license inconsistency
 
 [2.1.2]
 
@@ -277,4 +289,3 @@
 * C4 for Quiet architecture. Context and Container diagrams.
 
 * Invite tab as default in settings
-