Skip to content

Commit

Permalink
Merge branch 'release/1.2.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Nov 9, 2022
2 parents a9c0a60 + 1899961 commit 573d378
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.2.2]

### Fixed
- Fixed issue where the main window would load before the app was ready, due to a bug in a new version of the `tao` crate.

## [1.2.1]

### Fixed

- Updated Tauri dependencies to new 1.2 release.
- Properly send user agent to VRChat API when connecting the websocket.
- Updated various dependencies to their latest version.
Expand Down
4 changes: 2 additions & 2 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oyasumi",
"version": "1.2.1",
"version": "1.2.2",
"author": "Raphiiko",
"license": "MIT",
"type": "module",
Expand Down Expand Up @@ -74,4 +74,4 @@
"prettier": "^2.7.1",
"typescript": "^4.8.4"
}
}
}
2 changes: 1 addition & 1 deletion src-elevated-sidecar/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumi-elevated-sidecar"
version = "1.2.1"
version = "1.2.2"
authors = ["Raphiiko"]
license = "MIT"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion src-shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumi-shared"
version = "1.2.1"
version = "1.2.2"
authors = ["Raphiiko"]
edition = "2021"
license = "MIT"
Expand Down
12 changes: 6 additions & 6 deletions src-tauri/Cargo.lock

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oyasumi"
version = "1.2.1"
version = "1.2.2"
description = ""
authors = ["Raphiiko"]
license = "MIT"
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"package": {
"productName": "Oyasumi",
"version": "1.2.1"
"version": "1.2.2"
},
"tauri": {
"allowlist": {
Expand Down Expand Up @@ -105,7 +105,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
"userAgent": "Oyasumi/1.2.1 (https://github.com/Raphiiko/Oyasumi)"
"userAgent": "Oyasumi/1.2.2 (https://github.com/Raphiiko/Oyasumi)"
},
{
"width": 500,
Expand All @@ -117,7 +117,7 @@
"center": true,
"theme": "Dark",
"transparent": true,
"userAgent": "Oyasumi/1.2.1 (https://github.com/Raphiiko/Oyasumi)"
"userAgent": "Oyasumi/1.2.2 (https://github.com/Raphiiko/Oyasumi)"
}
]
}
Expand Down

0 comments on commit 573d378

Please sign in to comment.