Skip to content

Commit cbd9381

Browse files
Copilotmr-cheffy
andauthored
Merge remote-tracking branch 'origin/dev' into little-zen
# Conflicts: # src/zen/kbs/ZenKeyboardShortcuts.sys.mjs Co-authored-by: mr-cheffy <91018726+mr-cheffy@users.noreply.github.com>
2 parents 685cddf + 9c88e3a commit cbd9381

74 files changed

Lines changed: 2227 additions & 790 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
3434

3535
### Firefox Versions
3636

37-
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0`! 🚀
38-
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0`!
37+
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.2`! 🚀
38+
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.2`!
3939

4040
### Contributing
4141

build/AppDir/zen.desktop

Lines changed: 673 additions & 6 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fb55808f9cdd2172649e551705008af4f98038fe
1+
73901ca17f4a2159dd4488cea8684e9abbfdcc89

locales/en-US/browser/browser/preferences/zen-preferences.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ zen-workspace-shortcut-switch-9 = Switch to Workspace 9
321321
zen-workspace-shortcut-switch-10 = Switch to Workspace 10
322322
zen-workspace-shortcut-forward = Forward Workspace
323323
zen-workspace-shortcut-backward = Backward Workspace
324+
zen-workspace-shortcut-create = Create New Workspace
324325
zen-sidebar-shortcut-toggle = Toggle Sidebar's Width
325326
zen-pinned-tab-shortcut-reset = Reset Pinned Tab to Pinned URL
326327
zen-split-view-shortcut-grid = Toggle Split View Grid

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"surfer": "surfer",
2828
"test": "python3 scripts/run_tests.py",
2929
"test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
30-
"ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
30+
"ffprefs": "${CARGO:-cargo} run --manifest-path tools/ffprefs/Cargo.toml --bin ffprefs -- prefs engine",
3131
"lc": "surfer license-check",
3232
"lc:fix": "surfer license-check --fix",
3333
"use-moz-src": "cd engine && ./mach use-moz-src",

prefs/zen/live-folders.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
- name: zen.live-folders.github.skip-new-pr-ui-check
6+
value: false

prefs/zen/split-view.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
- name: zen.splitView.enable-tab-drop
66
value: true
77

8+
- name: zen.splitView.enable-tab-click-split
9+
value: true
10+
811
- name: zen.splitView.min-resize-width
912
value: 7
1013

prefs/zen/theme.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
value: true
1919

2020
- name: zen.theme.acrylic-elements
21-
value: false
21+
value: "@IS_TWILIGHT@"
2222

2323
- name: zen.theme.disable-lightweight
2424
value: true

prefs/zen/view.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,8 @@
6161
- name: zen.view.overflow-webext-toolbar
6262
value: "@IS_TWILIGHT@"
6363

64+
- name: zen.view.overflow-webext-toolbar-threshold
65+
value: 60
66+
6467
- name: zen.view.enable-loading-indicator
6568
value: true

0 commit comments

Comments
 (0)