Skip to content

Commit 9ea25d7

Browse files
rstanuwijayarstanuwijaya
committed
Squashed commit of the following:
commit b078244 Author: mr. m <[email protected]> Date: Fri May 16 12:16:38 2025 +0200 fix: Fixed workspaces import, b=(no-bug), c=no-component commit 619a8d3 Merge: 086d163 9b8195d Author: mr. m <[email protected]> Date: Fri May 16 08:43:39 2025 +0200 Merge pull request #8346 from zen-browser/ultimate-sidebar-revamp commit 9b8195d Author: mr. m <[email protected]> Date: Fri May 16 01:22:45 2025 +0200 Update src/browser/base/content/zen-sidebar-icons.inc.xhtml Co-authored-by: Copilot <[email protected]> Signed-off-by: mr. m <[email protected]> commit 22d04ad Author: Mr. M <[email protected]> Date: Fri May 16 01:17:11 2025 +0200 chore: Changed ZenWorkspaces to gZenWorkspaces, b=(no-bug), c=tabs, common, folders, glance, media, tests, welcome, workspaces commit bac3e38 Author: Mr. M <[email protected]> Date: Thu May 15 23:36:10 2025 +0200 feat: Re-implemented workspace icons, b=(no-bug), c=common, tabs, workspaces commit 1d8e0fc Author: Mr. M <[email protected]> Date: Thu May 15 21:25:54 2025 +0200 feat: Revamped the sidebar for complete stability over future releases, b=(no-bug), c=common, tabs, workspaces commit 086d163 Merge: d7bf8b2 b260942 Author: mr. m <[email protected]> Date: Thu May 15 13:45:30 2025 +0200 Merge pull request #8340 from SO9010/Fix-#7609 Fix #7609 by changing to orange when white. commit b260942 Author: Samuel Oldham <so9010> Date: Thu May 15 12:24:58 2025 +0000 Fix #7609 by changing to orange when white. commit d7bf8b2 Author: mr. m <[email protected]> Date: Thu May 15 00:35:55 2025 +0200 fix: Try to fix alignment issues for audio icons, b=(no-bug), c=tabs commit 0ded78e Author: Mr. M <[email protected]> Date: Wed May 14 16:10:28 2025 +0200 fix: Fixed all tabs button appearing on the sidebar, b=(no-bug), c=common, tabs commit c2d484a Author: mr. m <[email protected]> Date: Wed May 14 15:49:44 2025 +0200 fix: Fixed a bunch of small styling issues, b=(no-bug), c=common, compact-mode commit 7ca3a9e Author: mr. m <[email protected]> Date: Wed May 14 12:45:40 2025 +0200 Create funding-manifest-urls Signed-off-by: mr. m <[email protected]> commit 2bd548f Merge: 367ad74 d9d3076 Author: Mr. M <[email protected]> Date: Wed May 14 08:45:15 2025 +0200 Merge branch 'dev' of https://github.com/zen-browser/desktop into dev commit d9d3076 Merge: 562274a b8254fd Author: mr. m <[email protected]> Date: Wed May 14 10:42:54 2025 +0200 Merge pull request #8300 from zen-browser/revert-8286-alert-autofix-9 Revert "Potential fix for code scanning alert no. 9: Workflow does not contain permissions" commit b8254fd Author: mr. m <[email protected]> Date: Wed May 14 10:42:46 2025 +0200 Revert "Potential fix for code scanning alert no. 9: Workflow does not contain permissions" commit 562274a Merge: 19f9624 40baf26 Author: mr. m <[email protected]> Date: Wed May 14 10:41:33 2025 +0200 Merge pull request #8299 from zen-browser/revert-8282-alert-autofix-16 Revert "Potential fix for code scanning alert no. 16: Workflow does not contain permissions" commit 19f9624 Merge: d735a1f 531f569 Author: mr. m <[email protected]> Date: Wed May 14 10:41:25 2025 +0200 Merge pull request #8298 from zen-browser/revert-8291-alert-autofix-11 Revert "Potential fix for code scanning alert no. 11: Workflow does not contain permissions" commit d735a1f Merge: 00fcd74 5880636 Author: mr. m <[email protected]> Date: Wed May 14 10:41:21 2025 +0200 Merge pull request #8297 from zen-browser/revert-8293-alert-autofix-20 Revert "Potential fix for code scanning alert no. 20: Workflow does not contain permissions" commit 40baf26 Author: mr. m <[email protected]> Date: Wed May 14 10:41:14 2025 +0200 Revert "Potential fix for code scanning alert no. 16: Workflow does not contain permissions" commit 5880636 Author: mr. m <[email protected]> Date: Wed May 14 10:41:11 2025 +0200 Revert "Potential fix for code scanning alert no. 20: Workflow does not contain permissions" commit 531f569 Author: mr. m <[email protected]> Date: Wed May 14 10:41:06 2025 +0200 Revert "Potential fix for code scanning alert no. 11: Workflow does not contain permissions" commit 00fcd74 Merge: 9477913 f594a0b Author: mr. m <[email protected]> Date: Wed May 14 10:39:35 2025 +0200 Merge pull request #8296 from zen-browser/revert-8294-alert-autofix-6 Revert "Potential fix for code scanning alert no. 6: Workflow does not contain permissions" commit f594a0b Author: mr. m <[email protected]> Date: Wed May 14 10:39:27 2025 +0200 Revert "Potential fix for code scanning alert no. 6: Workflow does not contain permissions" commit 9477913 Merge: cd3823f a2b1b38 Author: mr. m <[email protected]> Date: Wed May 14 10:37:33 2025 +0200 Merge pull request #8295 from zen-browser/revert-8285-alert-autofix-13 Revert "Potential fix for code scanning alert no. 13: Workflow does not contain permissions" commit a2b1b38 Author: mr. m <[email protected]> Date: Wed May 14 10:37:24 2025 +0200 Revert "Potential fix for code scanning alert no. 13: Workflow does not contain permissions" commit cd3823f Merge: 455a2c0 8451a71 Author: mr. m <[email protected]> Date: Wed May 14 10:31:15 2025 +0200 Merge pull request #8294 from zen-browser/alert-autofix-6 Potential fix for code scanning alert no. 6: Workflow does not contain permissions commit 8451a71 Author: mr. m <[email protected]> Date: Wed May 14 10:31:08 2025 +0200 Potential fix for code scanning alert no. 6: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 455a2c0 Merge: 52b19fc 4ad29e0 Author: mr. m <[email protected]> Date: Wed May 14 10:29:04 2025 +0200 Merge pull request #8293 from zen-browser/alert-autofix-20 Potential fix for code scanning alert no. 20: Workflow does not contain permissions commit 4ad29e0 Author: mr. m <[email protected]> Date: Wed May 14 10:28:57 2025 +0200 Potential fix for code scanning alert no. 20: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 52b19fc Merge: 7958417 744618a Author: mr. m <[email protected]> Date: Wed May 14 10:26:48 2025 +0200 Merge pull request #8292 from zen-browser/alert-autofix-8 Potential fix for code scanning alert no. 8: Workflow does not contain permissions commit 7958417 Merge: db271db 07296f1 Author: mr. m <[email protected]> Date: Wed May 14 10:26:30 2025 +0200 Merge pull request #8291 from zen-browser/alert-autofix-11 Potential fix for code scanning alert no. 11: Workflow does not contain permissions commit 744618a Author: mr. m <[email protected]> Date: Wed May 14 10:26:26 2025 +0200 Potential fix for code scanning alert no. 8: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 07296f1 Author: mr. m <[email protected]> Date: Wed May 14 10:26:23 2025 +0200 Potential fix for code scanning alert no. 11: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit db271db Merge: d30a24e fc908f9 Author: mr. m <[email protected]> Date: Wed May 14 10:25:37 2025 +0200 Merge pull request #8287 from zen-browser/alert-autofix-5 Potential fix for code scanning alert no. 5: Workflow does not contain permissions commit d30a24e Merge: 2b359ea 67a52ae Author: mr. m <[email protected]> Date: Wed May 14 10:25:00 2025 +0200 Merge pull request #8289 from zen-browser/alert-autofix-1 Potential fix for code scanning alert no. 1: Workflow does not contain permissions commit 2b359ea Merge: 8af3fae 4b14c1e Author: mr. m <[email protected]> Date: Wed May 14 10:24:53 2025 +0200 Merge pull request #8288 from zen-browser/alert-autofix-2 Potential fix for code scanning alert no. 2: Workflow does not contain permissions commit 8af3fae Merge: 0c5716f d19a484 Author: mr. m <[email protected]> Date: Wed May 14 10:24:31 2025 +0200 Merge pull request #8290 from zen-browser/alert-autofix-12 Potential fix for code scanning alert no. 12: Workflow does not contain permissions commit 0c5716f Merge: 38bf9be 77bc3ce Author: mr. m <[email protected]> Date: Wed May 14 10:20:15 2025 +0200 Merge pull request #8286 from zen-browser/alert-autofix-9 Potential fix for code scanning alert no. 9: Workflow does not contain permissions commit d19a484 Author: mr. m <[email protected]> Date: Wed May 14 10:19:55 2025 +0200 Potential fix for code scanning alert no. 12: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 38bf9be Merge: d79b89f 34dc835 Author: mr. m <[email protected]> Date: Wed May 14 10:19:47 2025 +0200 Merge pull request #8285 from zen-browser/alert-autofix-13 Potential fix for code scanning alert no. 13: Workflow does not contain permissions commit d79b89f Merge: 7855d65 81b279b Author: mr. m <[email protected]> Date: Wed May 14 10:19:23 2025 +0200 Merge pull request #8284 from zen-browser/alert-autofix-14 Potential fix for code scanning alert no. 14: Workflow does not contain permissions commit 7855d65 Merge: b4a4963 828c7be Author: mr. m <[email protected]> Date: Wed May 14 10:19:16 2025 +0200 Merge pull request #8283 from zen-browser/alert-autofix-15 Potential fix for code scanning alert no. 15: Workflow does not contain permissions commit 67a52ae Author: mr. m <[email protected]> Date: Wed May 14 10:18:37 2025 +0200 Potential fix for code scanning alert no. 1: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 4b14c1e Author: mr. m <[email protected]> Date: Wed May 14 10:18:35 2025 +0200 Potential fix for code scanning alert no. 2: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit fc908f9 Author: mr. m <[email protected]> Date: Wed May 14 10:18:30 2025 +0200 Potential fix for code scanning alert no. 5: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 77bc3ce Author: mr. m <[email protected]> Date: Wed May 14 10:18:25 2025 +0200 Potential fix for code scanning alert no. 9: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 34dc835 Author: mr. m <[email protected]> Date: Wed May 14 10:18:15 2025 +0200 Potential fix for code scanning alert no. 13: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 81b279b Author: mr. m <[email protected]> Date: Wed May 14 10:18:13 2025 +0200 Potential fix for code scanning alert no. 14: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 828c7be Author: mr. m <[email protected]> Date: Wed May 14 10:18:12 2025 +0200 Potential fix for code scanning alert no. 15: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit b4a4963 Merge: ecc6df3 1caa6d9 Author: mr. m <[email protected]> Date: Wed May 14 10:17:45 2025 +0200 Merge pull request #8282 from zen-browser/alert-autofix-16 Potential fix for code scanning alert no. 16: Workflow does not contain permissions commit 1caa6d9 Author: mr. m <[email protected]> Date: Wed May 14 10:17:24 2025 +0200 Potential fix for code scanning alert no. 16: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit ecc6df3 Merge: 252af87 0310e89 Author: mr. m <[email protected]> Date: Wed May 14 10:17:11 2025 +0200 Merge pull request #8281 from zen-browser/alert-autofix-17 Potential fix for code scanning alert no. 17: Overly permissive regular expression range commit 0310e89 Author: mr. m <[email protected]> Date: Wed May 14 10:16:59 2025 +0200 Potential fix for code scanning alert no. 17: Overly permissive regular expression range Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 252af87 Merge: 3868f8e 6732a69 Author: mr. m <[email protected]> Date: Wed May 14 10:16:48 2025 +0200 Merge pull request #8280 from zen-browser/alert-autofix-19 Potential fix for code scanning alert no. 19: Overly permissive regular expression range commit 6732a69 Author: mr. m <[email protected]> Date: Wed May 14 10:16:36 2025 +0200 Potential fix for code scanning alert no. 19: Overly permissive regular expression range Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit 3868f8e Merge: e53a95e 937408f Author: mr. m <[email protected]> Date: Wed May 14 10:14:55 2025 +0200 Merge pull request #8279 from zen-browser/alert-autofix-18 Potential fix for code scanning alert no. 18: Overly permissive regular expression range commit 937408f Author: mr. m <[email protected]> Date: Wed May 14 10:14:16 2025 +0200 Potential fix for code scanning alert no. 18: Overly permissive regular expression range Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: mr. m <[email protected]> commit e53a95e Merge: b741532 0021c35 Author: mr. m <[email protected]> Date: Wed May 14 10:13:05 2025 +0200 Merge branch 'dev' of https://github.com/zen-browser/desktop into dev commit b741532 Author: mr. m <[email protected]> Date: Wed May 14 10:12:51 2025 +0200 chore: Remove remaining bits from zen rices, b=(no-bug), c=workspaces commit 0021c35 Author: mr. m <[email protected]> Date: Wed May 14 10:03:06 2025 +0200 Added security instructions for new reports Signed-off-by: mr. m <[email protected]> commit 367ad74 Author: Mr. M <[email protected]> Date: Wed May 14 08:45:07 2025 +0200 chore: Use npm for surfer CI windows signing, b=(no-bug), c=no-component commit 0abf17c Author: Mr. M <[email protected]> Date: Tue May 13 20:00:31 2025 +0200 fix: Fixed an issue with opening bookmarks with different containers, b=(no-bug), c=common commit be76e75 Merge: f8a893e 89dfc86 Author: mr. m <[email protected]> Date: Tue May 13 19:43:11 2025 +0200 Merge branch 'dev' of https://github.com/zen-browser/desktop into dev commit f8a893e Author: mr. m <[email protected]> Date: Tue May 13 19:43:00 2025 +0200 fix: Small fixes for toast notifications, b=(no-bug), c=common commit 89dfc86 Author: Mr. M <[email protected]> Date: Tue May 13 17:33:07 2025 +0200 fix: Fixed missaligment on mute/unmute icon, b=(no-bug), c=tabs commit bc894f8 Author: Mr. M <[email protected]> Date: Tue May 13 17:00:58 2025 +0200 style: Improved URL bar styles, b=(no-bug), c=common commit 20120ec Merge: a9c344d 3cbfae7 Author: Mr. M <[email protected]> Date: Tue May 13 16:35:38 2025 +0200 Merge branch 'dev' of https://github.com/zen-browser/desktop into dev commit a9c344d Author: Mr. M <[email protected]> Date: Tue May 13 16:35:24 2025 +0200 fix: Fixed background tabs opening when a tab is created by an addon, b=(no-bug), c=tabs, common, compact-mode commit 3cbfae7 Author: mr. m <[email protected]> Date: Tue May 13 16:12:15 2025 +0200 fix: Fixed macos close buttons being misaligned on collapsed sidebar, b=(closes #7129), c=tabs commit 9087653 Author: Mr. M <[email protected]> Date: Tue May 13 16:07:24 2025 +0200 fix: Fixed the download animation appearing on all the windows, b=(closes #8247), c=no-component commit 641d4d0 Author: Mr. M <[email protected]> Date: Tue May 13 15:58:39 2025 +0200 chore: Updated to firefox 138.0.3, b=(no-bug), c=scripts, common commit 7c12ad7 Merge: 66e0dde 5a4877a Author: mr. m <[email protected]> Date: Tue May 13 13:39:54 2025 +0200 Merge pull request #8266 from zen-browser/haptic-feedback commit 66e0dde Author: Mr. M <[email protected]> Date: Tue May 13 13:38:47 2025 +0200 fix: Make sure to remove the stylesheets before removing the file, b=(no-bug), c=mods commit 5a4877a Author: mr. m <[email protected]> Date: Tue May 13 13:37:36 2025 +0200 chore: Minor changes before merge of haptic feedback, b=(no-bug), c=workspaces commit f9b0f8c Author: mr. m <[email protected]> Date: Tue May 13 13:31:03 2025 +0200 feat: Finished haptic feedback support, b=(no-bug), c=common, tabs, workspaces commit 6552ec5 Author: Mr. M <[email protected]> Date: Tue May 13 12:00:39 2025 +0200 test: Added tests for closing glance, b=(no-bug), c=glance, tests commit 337b1ae Author: Mr. M <[email protected]> Date: Tue May 13 11:31:07 2025 +0200 fix: Fixed top toolbar staying at the top when clicking on the urlbar, b=(no-bug), c=compact-mode commit 33fff9e Merge: 561da4b 2cdaf48 Author: mr. m <[email protected]> Date: Tue May 13 10:40:48 2025 +0200 Merge branch 'haptic-feedback' of https://github.com/zen-browser/desktop into haptic-feedback commit 2cdaf48 Author: Mr. M <[email protected]> Date: Tue May 13 10:40:41 2025 +0200 feat: Compile the function even if we are not on mac, b=(no-bug), c=common commit 561da4b Author: mr. m <[email protected]> Date: Tue May 13 10:39:47 2025 +0200 chore: Format, b=(no-bug), c=common commit 3a8767e Author: Mr. M <[email protected]> Date: Tue May 13 10:37:36 2025 +0200 fix: Fixed windows API build, b=(no-bug), c=tabs, common commit 4947b4c Author: Mr. M <[email protected]> Date: Tue May 13 10:33:24 2025 +0200 feat: Addded haptic feedback support, b=(no-bug), c=common
1 parent d393385 commit 9ea25d7

File tree

84 files changed

+878
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+878
-650
lines changed

‎.github/workflows/check-candidate-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '59 4 * * 2'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
check_candidates:
1013
runs-on: ubuntu-latest

‎.github/workflows/code-linter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
branches:
1111
- dev
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
lint:
1518
runs-on: ubuntu-latest

‎.github/workflows/issue-metrics.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Monthly issue metrics
2+
permissions:
3+
contents: write
4+
issues: read
25
on:
36
workflow_dispatch:
47
schedule:

‎.github/workflows/macos-release-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: macOS Release Build
2+
permissions:
3+
contents: read
24

35
on:
46
workflow_call:

‎.github/workflows/pr-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Pull request test
2+
permissions:
3+
contents: read
24

35
on:
46
pull_request:

‎.github/workflows/windows-profile-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Windows PGO Builds
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_call:
58
inputs:

‎.github/workflows/windows-release-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Windows Release Build
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_call:
58
inputs:

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
"regex": "cpp",
2828
"type_traits": "cpp"
2929
},
30-
"git.ignoreLimitWarning": true
30+
"git.ignoreLimitWarning": true,
31+
"cmake.sourceDirectory": "/Users/maurob/work/desktop/tools/virustotal-checker"
3132
}

‎.well-known/funding-manifest-urls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://zen-browser.app/funding.json

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
## 🖥️ Compatibility
3030

31-
Zen is currently built using Firefox version `138.0.1`! 🚀
31+
Zen is currently built using Firefox version `138.0.3`! 🚀
3232

33-
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 138.0.1`!
33+
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 138.0.3`!
3434
- Check out the latest [release notes](https://zen-browser.app/release-notes)!
3535
- Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
3636

‎SECURITY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Security Policy
2+
3+
## Reporting a Vulnerability
4+
5+
Please report security vulnerabilities [here](https://github.com/zen-browser/desktop/security/advisories/new)

‎build/firefox-cache/l10n-last-commit-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8113a66aeeec42dca9739c7b742a3408cb5b7cf7
1+
a7fc259e12695c40d6ae249950f054221fed4f95

‎build/winsign/sign.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Start-Job -Name "DownloadGitl10n" -ScriptBlock {
3030
Start-Job -Name "SurferInit" -ScriptBlock {
3131
param($PWD)
3232
cd $PWD
33-
surfer -- ci --brand release
3433
npm run import -- --verbose
34+
npm run surfer -- ci --brand release
3535
} -Verbose -ArgumentList $PWD -Debug
3636

3737
echo "Downloading artifacts info"

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"scripts": {
99
"build": "surfer build",
1010
"build:ui": "surfer build --ui",
11-
"start": "cd engine && ./mach run --noprofile --marionette",
11+
"start": "cd engine && ./mach run --noprofile",
1212
"import": "surfer import",
1313
"export": "surfer export",
1414
"init": "npm run download && npm run bootstrap && npm run import",

‎scripts/check_rc_response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def get_rc_response() -> Optional[str]:
3838
for tag_dict in data["tags"]:
3939
tag = tag_dict["tag"]
4040
if (tag.startswith("FIREFOX") and tag.endswith("_BUILD1")
41-
and "ESR" not in tag and "b" not in tag):
41+
and "ESR" not in tag and "b" not in tag and "ANDROID" not in tag):
4242
return (tag.replace("FIREFOX_", "").replace("_BUILD1",
4343
"").replace("_", "."))
4444
except (FileNotFoundError, json.JSONDecodeError) as e:

‎src/browser/app/profile/features.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ pref('zen.view.show-newtab-button-top', true);
1919

2020
pref('zen.mediacontrols.enabled', true);
2121

22+
// Exposure:
23+
pref('zen.haptic-feedback.enabled', true);
24+
2225
#ifdef MOZILLA_OFFICIAL
2326
pref('zen.rice.api.url', 'https://share.zen-browser.app', locked);
2427
pref('zen.injections.match-urls', 'https://zen-browser.app/*,https://share.zen-browser.app/*', locked);

‎src/browser/app/profile/firefox-js.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index 89b8b830e8f53582dd9910b0172098d31a8d8967..51bdc847823cb95f811b7e9d2d864b9aacf0e364 100644
2+
index eda8312b0edd34ed22c94c224167680ac6c9c459..56de47f79c553dab2676e127f5320e352b7d3a77 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
5-
@@ -3375,3 +3375,5 @@ pref("toolkit.contentRelevancy.enabled", false);
5+
@@ -3377,3 +3377,5 @@ pref("toolkit.contentRelevancy.enabled", false);
66
pref("toolkit.contentRelevancy.ingestEnabled", false);
77
// Pref to enable extra logging for the content relevancy feature
88
pref("toolkit.contentRelevancy.log", false);

‎src/browser/base/content/appmenu-viewcache-inc-xhtml.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/browser/base/content/browser-init-js.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ index 3d5173315812589c0b79beec5f0419fc37cb8868..c4216db9e414fbbaead6ecd89b40366b
1515
TelemetryTimestamps.add("delayedStartupStarted");
1616

1717
this._cancelDelayedStartup();
18-
+ ZenWorkspaces.afterLoadInit();
18+
+ gZenWorkspaces.afterLoadInit();
1919

2020
gBrowser.addEventListener(
2121
"PermissionStateChange",

‎src/browser/base/content/browser-js.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
2-
index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..bd95ef5d6b99399c859af1cf71d9d62477f4ac2b 100644
2+
index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..08568d90f888cc262a23ffaa72e985e7c3463b93 100644
33
--- a/browser/base/content/browser.js
44
+++ b/browser/base/content/browser.js
55
@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -15,7 +15,7 @@ index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..bd95ef5d6b99399c859af1cf71d9d624
1515
TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
1616

1717
+ gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
18-
+ ZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
18+
+ gZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
1919
+ gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
2020
+ gZenPinnedTabManager.onLocationChange(gBrowser.selectedBrowser);
2121
+
@@ -27,7 +27,7 @@ index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..bd95ef5d6b99399c859af1cf71d9d624
2727
ignoreFragmentWhenComparing
2828
);
2929
- let browsers = aWindow.gBrowser.browsers;
30-
+ let browsers = aWindow.ZenWorkspaces.allUsedBrowsers;
30+
+ let browsers = aWindow.gZenWorkspaces.allUsedBrowsers;
3131
for (let i = 0; i < browsers.length; i++) {
3232
let browser = browsers[i];
3333
let browserCompare = cleanURL(
@@ -36,7 +36,7 @@ index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..bd95ef5d6b99399c859af1cf71d9d624
3636

3737
if (!doAdopt) {
3838
- aWindow.gBrowser.tabContainer.selectedIndex = i;
39-
+ aWindow.ZenWorkspaces.switchIfNeeded(browser, i);
39+
+ aWindow.gZenWorkspaces.switchIfNeeded(browser, i);
4040
}
4141

4242
return true;

‎src/browser/base/content/navigator-toolbox-inc-xhtml.patch

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
2-
index 00c8976d3e258c0875d7da2f3ec823d8907a84c9..b5735712aaa7c2ae2baa4b858e735413b130ca94 100644
2+
index 00c8976d3e258c0875d7da2f3ec823d8907a84c9..cc61d5a845b5ce22a61f5a1aab8b280b2bcdf101 100644
33
--- a/browser/base/content/navigator-toolbox.inc.xhtml
44
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
55
@@ -2,7 +2,7 @@
@@ -22,27 +22,24 @@ index 00c8976d3e258c0875d7da2f3ec823d8907a84c9..b5735712aaa7c2ae2baa4b858e735413
2222
<toolbar id="TabsToolbar"
2323
class="browser-toolbar browser-titlebar"
2424
fullscreentoolbar="true"
25-
@@ -50,6 +50,10 @@
25+
@@ -50,6 +50,8 @@
2626
tooltip="tabbrowser-tab-tooltip"
2727
orient="horizontal"
2828
stopwatchid="tabClick">
29-
+<html:div id="zen-essentials-wrapper" skipintoolbarset="true"></html:div>
30-
+<hbox id="zen-current-workspace-indicator-container"></hbox>
29+
+<html:div id="zen-essentials" skipintoolbarset="true"></html:div>
3130
+<html:div id="zen-tabs-wrapper">
32-
+<html:div id="zen-browser-tabs-container">
3331
<hbox class="tab-drop-indicator" hidden="true"/>
3432
<html:span id="tab-drag-empty-feedback" role="presentation"/>
3533
# If the name (tabbrowser-arrowscrollbox) or structure of this changes
36-
@@ -76,6 +80,8 @@
34+
@@ -76,6 +78,7 @@
3735
tooltip="dynamic-shortcut-tooltip"
3836
data-l10n-id="tabs-toolbar-new-tab"/>
3937
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
40-
+</html:div>
4138
+</html:div>
4239
</tabs>
4340

4441
<toolbarbutton id="new-tab-button"
45-
@@ -101,9 +107,10 @@
42+
@@ -101,9 +104,10 @@
4643
#include private-browsing-indicator.inc.xhtml
4744
<toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
4845

‎src/browser/base/content/zen-assets.jar.inc.mn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (../../zen/mods/actors/ZenThemeMarketplaceParent.sys.mjs)
4040
content/browser/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs (../../zen/mods/actors/ZenThemeMarketplaceChild.sys.mjs)
4141

42+
content/browser/zen-components/ZenWorkspaceIcons.mjs (../../zen/workspaces/ZenWorkspaceIcons.mjs)
43+
content/browser/zen-components/ZenWorkspace.mjs (../../zen/workspaces/ZenWorkspace.mjs)
4244
content/browser/zen-components/ZenWorkspaces.mjs (../../zen/workspaces/ZenWorkspaces.mjs)
4345
content/browser/zen-components/ZenWorkspacesStorage.mjs (../../zen/workspaces/ZenWorkspacesStorage.mjs)
4446
content/browser/zen-components/ZenWorkspacesSync.mjs (../../zen/workspaces/ZenWorkspacesSync.mjs)

‎src/browser/base/content/zen-preloaded.inc.xhtml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
Services.scriptloader.loadSubScript("chrome://browser/content/zen-sets.js", this);
66
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCommonUtils.mjs", this);
77
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this);
8+
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs", this);
9+
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspace.mjs", this);
810
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs", this);
911
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesSync.mjs", this);
1012
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenActorsManager.mjs", this);

‎src/browser/base/content/zen-sidebar-icons.inc.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
context="toolbar-context-menu"
1010
mode="icons">
1111
<toolbarbutton removable="true" class="chromeclass-toolbar-additional toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" command="cmd_zenToggleSidebar" data-l10n-id="sidebar-zen-expand"></toolbarbutton>
12-
<toolbarbutton id="zen-workspaces-button" class="chromeclass-toolbar-additional" overflows="false" removable="false"></toolbarbutton>
12+
<zen-workspace-icons id="zen-workspaces-button" overflows="false" removable="false"></zen-workspace-icons>
1313
</toolbar>

‎src/browser/components/customizableui/CustomizeMode-sys-mjs.patch

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
2-
index 619bb2af5a3a0995fc93fa040696dd2854848ab5..bbc6bad906e9ccaf668ca99f4a0411f564ef1e56 100644
2+
index 619bb2af5a3a0995fc93fa040696dd2854848ab5..14ad5f6122971a0a0dc20d22acdc073f84965dad 100644
33
--- a/browser/components/customizableui/CustomizeMode.sys.mjs
44
+++ b/browser/components/customizableui/CustomizeMode.sys.mjs
55
@@ -500,7 +500,7 @@ export class CustomizeMode {
@@ -20,7 +20,15 @@ index 619bb2af5a3a0995fc93fa040696dd2854848ab5..bbc6bad906e9ccaf668ca99f4a0411f5
2020
customizer.hidden = true;
2121
browser.hidden = false;
2222

23-
@@ -3125,6 +3125,20 @@ export class CustomizeMode {
23+
@@ -1173,6 +1173,7 @@ export class CustomizeMode {
24+
return (
25+
aNode.localName == "toolbarbutton" ||
26+
aNode.localName == "toolbaritem" ||
27+
+ aNode.localName == "zen-workspace-icons" ||
28+
aNode.localName == "toolbarseparator" ||
29+
aNode.localName == "toolbarspring" ||
30+
aNode.localName == "toolbarspacer"
31+
@@ -3125,6 +3126,20 @@ export class CustomizeMode {
2432
if (makeSpaceImmediately) {
2533
aDraggedOverItem.setAttribute("notransition", "true");
2634
}

‎src/browser/components/extensions/parent/ext-tabs-js.patch

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
2-
index b47f0510e32d788dfe7c3109474c4512c9900d4a..49697125a2998bbd50d87c54e2c5974baaf9a7e2 100644
2+
index 517ea0079c12941a844a4f9e4ba694c6411887ee..510ab14dfa2178c332c9862d6a01b75bd12dfe3b 100644
33
--- a/browser/components/extensions/parent/ext-tabs.js
44
+++ b/browser/components/extensions/parent/ext-tabs.js
5-
@@ -468,6 +468,7 @@ this.tabs = class extends ExtensionAPIPersistent {
5+
@@ -482,6 +482,7 @@ this.tabs = class extends ExtensionAPIPersistent {
66
}
77

88
let tab = tabManager.getWrapper(event.originalTarget);
99
+ if (!tab) return;
1010

1111
let changeInfo = {};
1212
for (let prop of needed) {
13+
@@ -836,6 +837,7 @@ this.tabs = class extends ExtensionAPIPersistent {
14+
});
15+
}
16+
17+
+ window.gZenCompactModeManager._nextTimeWillBeActive = active;
18+
let nativeTab = window.gBrowser.addTab(url, options);
19+
20+
if (active) {

‎src/browser/components/places/PlacesUIUtils-sys-mjs.patch

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
2-
index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035ecc4016d2 100644
2+
index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..028b899b7a5da7ba398965861ff044e596c27666 100644
33
--- a/browser/components/places/PlacesUIUtils.sys.mjs
44
+++ b/browser/components/places/PlacesUIUtils.sys.mjs
55
@@ -59,6 +59,7 @@ class BookmarkState {
@@ -157,20 +157,12 @@ index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035e
157157
/**
158158
* Append transactions to update tags by given information.
159159
*
160-
@@ -903,8 +1012,15 @@ export var PlacesUIUtils = {
160+
@@ -903,7 +1012,7 @@ export var PlacesUIUtils = {
161161
aNode,
162162
aWhere,
163163
aWindow,
164164
- { aPrivate = false, userContextId = 0 } = {}
165165
+ { aPrivate = false, userContextId = undefined } = {}
166166
) {
167-
+ if (typeof userContextId == "undefined") {
168-
+ try {
169-
+ let browserWindow = getBrowserWindow(aWindow);
170-
+ userContextId = browserWindow.ZenWorkspaces.getDefaultContainer();
171-
+ } catch {}
172-
+ }
173-
+
174167
if (
175168
aNode &&
176-
lazy.PlacesUtils.nodeIsURI(aNode) &&

‎src/browser/components/places/content/browserPlacesViews-js.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
2-
index ad138a38340e8e8510d395f46c30ec4121d731bb..9294f05633acbe560df003333b7ef7d9a12a2a11 100644
2+
index ad138a38340e8e8510d395f46c30ec4121d731bb..52beaa66395e2b240a7122936cd4d2452b386724 100644
33
--- a/browser/components/places/content/browserPlacesViews.js
44
+++ b/browser/components/places/content/browserPlacesViews.js
55
@@ -330,12 +330,23 @@ class PlacesViewBase {
@@ -13,7 +13,7 @@ index ad138a38340e8e8510d395f46c30ec4121d731bb..9294f05633acbe560df003333b7ef7d9
1313
+ let child = resultNode.getChild(i);
1414
+ // Skip nodes that don't belong in current workspace
1515
+ if (PlacesUtils.nodeIsURI(child) || PlacesUtils.containerTypes.includes(child.type)) {
16-
+ if (typeof ZenWorkspaces !== 'undefined' && ZenWorkspaces.isBookmarkInAnotherWorkspace(child)) {
16+
+ if (typeof gZenWorkspaces !== 'undefined' && gZenWorkspaces.isBookmarkInAnotherWorkspace(child)) {
1717
+ continue;
1818
+ }
1919
+ }
@@ -52,7 +52,7 @@ index ad138a38340e8e8510d395f46c30ec4121d731bb..9294f05633acbe560df003333b7ef7d9
5252
+ for (let i = 0; i < cc; i++) {
5353
+ let child = this._resultNode.getChild(i);
5454
+ if (PlacesUtils.nodeIsURI(child) || PlacesUtils.containerTypes.includes(child.type)) {
55-
+ if (!(typeof ZenWorkspaces !== 'undefined' && ZenWorkspaces.isBookmarkInAnotherWorkspace(child))) {
55+
+ if (!(typeof gZenWorkspaces !== 'undefined' && gZenWorkspaces.isBookmarkInAnotherWorkspace(child))) {
5656
+ visibleNodes.push(child);
5757
+ }
5858
+ } else {

‎src/browser/components/preferences/zen-settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ var gZenMarketplaceManager = {
275275
const themeList = document.createElement('div');
276276

277277
for (const theme of Object.values(themes).sort((a, b) => a.name.localeCompare(b.name))) {
278-
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
278+
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
279279
const isThemeEnabled = theme.enabled === undefined || theme.enabled;
280280
const fragment = window.MozXULElement.parseXULToFragment(`
281281
<vbox class="zenThemeMarketplaceItem">

0 commit comments

Comments
 (0)