Skip to content

Commit

Permalink
Merge pull request #719 from hovancik/release
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
hovancik committed Oct 3, 2020
2 parents 2027177 + 9032a98 commit 47fc4f6
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 117 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
script:
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_BRANCH" == "release" ]]; then sudo apt update && sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib bsdtar rpm libopenjp2-tools; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_BRANCH" == "release" ]]; then brew install rpm; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_BRANCH" == "release" ]]; then electron-builder --linux snap -c.snap.publish=github; fi
- npx nyc --reporter=lcov npm test && npx codecov
- if [[ "$TRAVIS_BRANCH" == "release" ]]; then npm run dist; fi

Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.2.0] - 2020-10-03
### Added
- new break ideas
- Contributors can sync preferences
- Nepali translations
- snap package

### Changed
- disallow "Reset breaks" when in break with Strick Mode
- break window size is now dynamic (relative to screen size)
- updated Korean translation

### Fixed
- fullscreen breaks (Windows)
- downgraded Electron and disabled macOS dock icon to fix fullscreen issues

## [1.1.99] - 2020-9-27 Patreon
### Added
Expand Down Expand Up @@ -483,7 +493,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.1.0...HEAD
[Unreleased]: https://github.com/hovancik/stretchly/compare/v1.2.0...HEAD
[1.2.0]: https://github.com/hovancik/stretchly/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/hovancik/stretchly/compare/v1.0.0...v1.1.0
[1.0.0]: https://github.com/hovancik/stretchly/compare/v0.99.5...v1.0.0
[0.99.5]: https://github.com/hovancik/stretchly/compare/v0.99.4...v0.99.5
Expand Down
8 changes: 4 additions & 4 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Stretchly",
"version": "1.1.99",
"version": "1.2.0",
"description": "The break time reminder app",
"main": "main.js",
"repository": {
Expand All @@ -22,7 +22,7 @@
"dependencies": {
"@meetfranz/electron-notification-state": "^1.0.0",
"electron-log": "^4.2.4",
"i18next": "^19.7.0",
"i18next": "^19.8.0",
"i18next-node-fs-backend": "^2.1.3",
"moment": "^2.29.0",
"semver": "^7.3.2",
Expand Down
Loading

0 comments on commit 47fc4f6

Please sign in to comment.