Skip to content

Commit

Permalink
Merge pull request #1186 from hovancik/release
Browse files Browse the repository at this point in the history
Release 1.11.0
  • Loading branch information
hovancik authored Aug 7, 2022
2 parents 74e3574 + 601aea4 commit 7fca992
Show file tree
Hide file tree
Showing 12 changed files with 1,215 additions and 1,085 deletions.
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
- apt update && apt-get install --no-install-recommends -y gcc-multilib g++-multilib bsdtar rpm libopenjp2-tools
- npm install
- npm install npm -g
- node_modules/.bin/electron-builder build --x64 --ia32
- node_modules/.bin/electron-builder build --x64
environment:
GH_TOKEN:
from_secret: GH_TOKEN
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
label: Version
description: We only support the latest version. Find your version number at `Preferences` - `About`.
options:
- label: I'm using version 1.10.0
- label: I'm using version 1.11.0
required: false
- type: checkboxes
id: known-issues
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
label: Version
description: We only support the latest version. Find your version number at `Preferences` - `About`.
options:
- label: I'm using version 1.10.0
- label: I'm using version 1.11.0
required: false
- type: checkboxes
id: open-requests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest]

fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.14.2'
- run: npm install npm -g
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/snap-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.14.2'
- run: npm install -g npm
- run: npm install
- run: node_modules/.bin/electron-builder --linux snap -c.snap.publish=github
- run: node_modules/.bin/electron-builder --linux snap --publish=never
env:
GH_TOKEN: ${{ secrets.github_token }}
- name: Setup Snapcraft
run: |
sudo snap install snapcraft --classic
echo "$SNAP_TOKEN" | snapcraft login --with -
snapcraft upload --release=stable ./dist/Stretchly_*.snap
snapcraft upload --release=candidate ./dist/Stretchly_*.snap
env:
SNAP_TOKEN: ${{secrets.snap_token}}
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
timezoneLinux: Europe/Amsterdam
timezoneMacos: Europe/Amsterdam
timezoneWindows: W. Europe Standard Time
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.14.2'
- run: npm install npm -g
Expand All @@ -28,4 +28,4 @@ jobs:
env:
CI: true
- name: Codecov
uses: codecov/codecov-action@v1.1.0
uses: codecov/codecov-action@v3
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.11.0] - 2022-8-7
### Added
- Japanese translations
- break ideas are translatable
- unregister shortcuts on app's quit

### Changed
- updated many translations
- no Linux 32 builds, as Electron does not support them anymore

### Fixed
- crashing when skipping to break and time to break in tray
Expand Down Expand Up @@ -653,7 +655,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- resume/pause functionality for reminder
- scripts for creating installers for OS X, Windows, Linux

[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.10.0...HEAD
[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.11.0...HEAD
[1.11.0]: https://github.com/hovancik/stretchly/compare/v1.10.0...v1.11.0
[1.10.0]: https://github.com/hovancik/stretchly/compare/v1.9.0...v1.10.0
[1.9.0]: https://github.com/hovancik/stretchly/compare/v1.8.1...v1.9.0
[1.8.1]: https://github.com/hovancik/stretchly/compare/v1.8.0...v1.8.1
Expand Down
24 changes: 16 additions & 8 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,8 @@ function startProcessWin () {
backgroundThrottling: false,
webPreferences: {
preload: path.join(__dirname, './process.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(processWin.webContents)
Expand All @@ -519,7 +520,8 @@ function createWelcomeWindow (isAppStart = true) {
backgroundColor: 'EDEDED',
webPreferences: {
preload: path.join(__dirname, './welcome.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(welcomeWin.webContents)
Expand Down Expand Up @@ -550,7 +552,8 @@ function createContributorSettingsWindow () {
backgroundColor: 'EDEDED',
webPreferences: {
preload: path.join(__dirname, './contributor-preferences.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(contributorPreferencesWindow.webContents)
Expand Down Expand Up @@ -582,7 +585,8 @@ function createSyncPreferencesWindow () {
backgroundColor: 'whitesmoke',
webPreferences: {
preload: path.resolve(__dirname, './electron-bridge.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(syncPreferencesWindow.webContents)
Expand Down Expand Up @@ -674,7 +678,8 @@ function startMicrobreak () {
title: 'Stretchly',
webPreferences: {
preload: path.join(__dirname, './microbreak.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
}

Expand Down Expand Up @@ -812,7 +817,8 @@ function startBreak () {
title: 'Stretchly',
webPreferences: {
preload: path.join(__dirname, './break.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
}

Expand Down Expand Up @@ -1079,7 +1085,8 @@ function createPreferencesWindow () {
backgroundColor: '#EDEDED',
webPreferences: {
preload: path.join(__dirname, './preferences.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(preferencesWin.webContents)
Expand Down Expand Up @@ -1393,7 +1400,8 @@ ipcMain.on('open-contributor-auth', function (event, provider) {
backgroundColor: 'whitesmoke',
webPreferences: {
preload: path.resolve(__dirname, './electron-bridge.js'),
enableRemoteModule: true
enableRemoteModule: true,
sandbox: false
}
})
require('@electron/remote/main').enable(myStretchlyWindow.webContents)
Expand Down
Loading

0 comments on commit 7fca992

Please sign in to comment.