Skip to content

Commit acbb345

Browse files
Merge remote-tracking branch 'origin/develop' into fix/sidebar-layout-tweaks
# Conflicts: # CHANGELOG.md Co-authored-by: holmesworcester <213678+holmesworcester@users.noreply.github.com>
2 parents 6e20945 + 0f94757 commit acbb345

27 files changed

Lines changed: 159 additions & 85 deletions

File tree

.github/workflows/mobile-deploy-ios.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Deploy iOS to App Store
22

33
on:
44
release:
5-
types:
6-
[prereleased, released]
5+
types: [prereleased, released]
76

87
jobs:
98
build-ios:
@@ -14,10 +13,10 @@ jobs:
1413
1514
strategy:
1615
matrix:
17-
os: [macos-14]
16+
os: [macos-26]
1817

1918
steps:
20-
- name: "Print OS"
19+
- name: 'Print OS'
2120
run: echo ${{ matrix.os }}
2221

2322
- uses: actions/checkout@v5
@@ -35,15 +34,15 @@ jobs:
3534
run: brew install gnupg
3635

3736
- name: Setup XCode
38-
uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98 # v1.5.1
37+
uses: maxim-lobanov/setup-xcode@v1
3938
with:
40-
xcode-version: '16.2.0'
39+
xcode-version: '26.3'
4140

4241
- name: Setup environment
4342
uses: ./.github/actions/setup-env
4443
with:
45-
cachePrefix: "deploy-ios"
46-
bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle,helia,@quiet/node-common"
44+
cachePrefix: 'deploy-ios'
45+
bootstrap-packages: '@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle,helia,@quiet/node-common'
4746

4847
- name: Install pod dependencies
4948
run: |
0 Bytes
Binary file not shown.

3rd-party/tor/darwin/tor

3.29 MB
Binary file not shown.

3rd-party/tor/linux/libcrypto.so.3

901 KB
Binary file not shown.

3rd-party/tor/linux/libssl.so.3

364 KB
Binary file not shown.

3rd-party/tor/linux/tor

36.4 KB
Binary file not shown.

3rd-party/tor/win32/tor.exe

1.17 MB
Binary file not shown.

CHANGELOG.md

Lines changed: 61 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,87 @@
11
# Changelog
22

3-
[unreleased]
3+
## [unreleased]
4+
5+
### Features
6+
7+
### Fixes
8+
9+
* The user profile tab at the bottom of the sidebar now has the correct opacity and layout, and the faint horizontal stripe that appeared on some platforms and window sizes is gone now. [#3184](https://github.com/TryQuiet/quiet/pull/3184)
10+
11+
### Chores
12+
13+
## [7.0.1]
414

515
### Features
616

7-
* Adds hcaptcha verification for protected QSS actions [#2908](https://github.com/TryQuiet/quiet/issues/2908)
8-
* Add ability to adjust image/file auto-download size threshold [#3019](https://github.com/TryQuiet/quiet/pull/3019)
9-
* Messages can now be relayed using QSS [#2805](https://github.com/TryQuiet/quiet/issues/2805)
10-
* Messages can be retrieved from QSS stores [#2806](https://github.com/TryQuiet/quiet/issues/2806)
11-
* Profile photos are now uploaded via IPFS [#3048](https://github.com/TryQuiet/quiet/issues/3048)
1217
* Registers APNS token with push notifications service [#3080](https://github.com/TryQuiet/quiet/issues/3080)
18+
* Adds push notification service [#3086](https://github.com/TryQuiet/quiet/issues/3086)
19+
20+
### Fixes
21+
22+
* Fixed bug around killing old tor process that results in an unhandled exception [#3135](https://github.com/TryQuiet/quiet/issues/3135)
23+
* Adds new mac entitlement to fix arm64 crashes on arm64 binaries [#3180](https://github.com/TryQuiet/quiet/issues/3180)
24+
* Fixed bug that caused a registration loop when QSS_ALLOWED is true but the endpoint is unset [#3140](https://github.com/TryQuiet/quiet/issues/3140)
25+
* Fix delay between sign-in and historical log entry pull from QSS [#3127](https://github.com/TryQuiet/quiet/issues/3127)
26+
27+
### Chores
28+
29+
* Upgrades NodeJS to 20.20.1
30+
31+
## [7.0.0]
32+
33+
### Features
34+
1335
* Create an invite lockbox when using QSS [#3057](https://github.com/TryQuiet/quiet/issues/3057)
1436
* Self-assign the member role when joining with QSS [#3058](https://github.com/TryQuiet/quiet/issues/3058)
1537
* Use LFA-based identity in OrbitDB
1638
* Requests iOS notification permissions when app launches [#3079](https://github.com/TryQuiet/quiet/issues/3079)
1739
* Adds push notification service [#3086](https://github.com/TryQuiet/quiet/issues/3086)
1840

41+
## [6.6.2]
42+
43+
### Fixes
44+
45+
* Fixed crashes on GrapheneOS devices
46+
47+
## [6.6.0]
48+
49+
### Features
50+
51+
* Adds hcaptcha verification for protected QSS actions [#2908](https://github.com/TryQuiet/quiet/issues/2908)
52+
* Messages can now be relayed using QSS [#2805](https://github.com/TryQuiet/quiet/issues/2805)
53+
* Messages can be retrieved from QSS stores [#2806](https://github.com/TryQuiet/quiet/issues/2806)
54+
* Profile photos are now uploaded via IPFS [#3048](https://github.com/TryQuiet/quiet/issues/3048)
55+
1956
### Fixes
2057

21-
* DisableWebDrag added to links listed in an issue [#481] (https://github.com/TryQuiet/quiet/issues/481)
2258
* Fixed being unable to quit application during initial load [#3046](https://github.com/TryQuiet/quiet/issues/3046)
2359
* Fixed trace logger toggles [#3045](https://github.com/TryQuiet/quiet/issues/3045)
24-
* Fixed auth issues when using QSS in AWS [#3128](https://github.com/TryQuiet/quiet/issues/3128)
25-
* Fixed bug around killing old tor process that results in an unhandled exception [#3135](https://github.com/TryQuiet/quiet/issues/3135)
26-
* Fixed bug that caused a registration loop when QSS_ALLOWED is true but the endpoint is unset [#3140](https://github.com/TryQuiet/quiet/issues/3140)
27-
* The user profile tab at the bottom of the sidebar now has the correct opacity and layout, and the faint horizontal stripe that appeared on some platforms and window sizes is gone now. [#3184](https://github.com/TryQuiet/quiet/pull/3184)
60+
* Handle AWS QSS endpoints in invite links [#3024](https://github.com/TryQuiet/quiet/issues/3024)
61+
62+
## [6.5.1]
2863

2964
### Chores
3065

31-
* Change autoupdater text [#2971](https://github.com/TryQuiet/quiet/issues/2971)
32-
* Fixed issues with testing workflows [#3030](https://github.com/TryQuiet/quiet/issues/3030)
33-
* Add MacOS arm64-specific build jobs to resolve slow UI startup on Apple Silicon [#3146](https://github.com/TryQuiet/quiet/issues/3146)
66+
* Updgrade NodeJS on mobile to 18.20.4
67+
* 16kb compliance changes on android
68+
69+
## [6.4.0]
70+
71+
### Features
72+
73+
* Add ability to adjust image/file auto-download size threshold [#3019](https://github.com/TryQuiet/quiet/pull/3019)
3474

3575
### Fixes
3676

37-
* Handle AWS QSS endpoints in invite links [#3024](https://github.com/TryQuiet/quiet/issues/3024)
77+
* DisableWebDrag added to links listed in an issue [#481] (https://github.com/TryQuiet/quiet/issues/481)
3878
* Fixes dialing on join when using AWS QSS [#3025](https://github.com/TryQuiet/quiet/issues/3025)
39-
* Fix delay between sign-in and historical log entry pull from QSS [#3127](https://github.com/TryQuiet/quiet/issues/3127)
79+
80+
### Chores
81+
82+
* Change autoupdater text [#2971](https://github.com/TryQuiet/quiet/issues/2971)
83+
* Fixed issues with testing workflows [#3030](https://github.com/TryQuiet/quiet/issues/3030)
84+
* Add MacOS arm64-specific build jobs to resolve slow UI startup on Apple Silicon [#3146](https://github.com/TryQuiet/quiet/issues/3146)
4085

4186
## [6.3.0]
4287

packages/desktop/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,34 @@
99
* Messages can now be relayed using QSS [#2805](https://github.com/TryQuiet/quiet/issues/2805)
1010
* Messages can be retrieved from QSS stores [#2806](https://github.com/TryQuiet/quiet/issues/2806)
1111
* Profile photos are now uploaded via IPFS [#3048](https://github.com/TryQuiet/quiet/issues/3048)
12+
* Registers APNS token with push notifications service [#3080](https://github.com/TryQuiet/quiet/issues/3080)
1213
* Create an invite lockbox when using QSS [#3057](https://github.com/TryQuiet/quiet/issues/3057)
1314
* Self-assign the member role when joining with QSS [#3058](https://github.com/TryQuiet/quiet/issues/3058)
1415
* Use LFA-based identity in OrbitDB
1516
* Requests iOS notification permissions when app launches [#3079](https://github.com/TryQuiet/quiet/issues/3079)
17+
* Adds push notification service [#3086](https://github.com/TryQuiet/quiet/issues/3086)
1618

1719
### Fixes
1820

1921
* DisableWebDrag added to links listed in an issue [#481] (https://github.com/TryQuiet/quiet/issues/481)
2022
* Fixed being unable to quit application during initial load [#3046](https://github.com/TryQuiet/quiet/issues/3046)
2123
* Fixed trace logger toggles [#3045](https://github.com/TryQuiet/quiet/issues/3045)
24+
* Fixed auth issues when using QSS in AWS [#3128](https://github.com/TryQuiet/quiet/issues/3128)
25+
* Fixed bug around killing old tor process that results in an unhandled exception [#3135](https://github.com/TryQuiet/quiet/issues/3135)
26+
* Adds new mac entitlement to fix arm64 crashes on arm64 binaries [#3180](https://github.com/TryQuiet/quiet/issues/3180)
27+
* Fixed bug that caused a registration loop when QSS_ALLOWED is true but the endpoint is unset [#3140](https://github.com/TryQuiet/quiet/issues/3140)
2228

2329
### Chores
2430

2531
* Change autoupdater text [#2971](https://github.com/TryQuiet/quiet/issues/2971)
26-
* Fixed issues with testing workflows [#3030] (https://github.com/TryQuiet/quiet/issues/3030)
32+
* Fixed issues with testing workflows [#3030](https://github.com/TryQuiet/quiet/issues/3030)
33+
* Add MacOS arm64-specific build jobs to resolve slow UI startup on Apple Silicon [#3146](https://github.com/TryQuiet/quiet/issues/3146)
2734

2835
### Fixes
2936

3037
* Handle AWS QSS endpoints in invite links [#3024](https://github.com/TryQuiet/quiet/issues/3024)
3138
* Fixes dialing on join when using AWS QSS [#3025](https://github.com/TryQuiet/quiet/issues/3025)
39+
* Fix delay between sign-in and historical log entry pull from QSS [#3127](https://github.com/TryQuiet/quiet/issues/3127)
3240

3341
## [6.3.0]
3442

packages/desktop/build/entitlements.mac.plist

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,12 @@
88
<true/>
99
<key>com.apple.security.cs.disable-library-validation</key>
1010
<true/>
11+
<!--
12+
Fixes crashes on arm64 (https://github.com/TryQuiet/quiet/issues/3180)
13+
14+
Fix found in: https://github.com/electron-userland/electron-builder/issues/7050#issuecomment-1226594909
15+
-->
16+
<key>com.apple.security.cs.allow-jit</key>
17+
<true/>
1118
</dict>
1219
</plist>

0 commit comments

Comments
 (0)