Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
lyswhut committed Oct 18, 2020
2 parents 42604ec + 8eb7149 commit c404d3a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 35 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
Change log format is based on [Keep a Changelog](http://keepachangelog.com/).

## [1.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v1.2.1...v1.2.2) - 2020-10-18

### 修复

- 降级 Electron 到 9.x.x 版本修复 Linux 版桌面歌词窗口变白的问题

## [1.2.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.2.0...v1.2.1) - 2020-10-18

### 优化
Expand Down
52 changes: 26 additions & 26 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": "lx-music-desktop",
"version": "1.2.1",
"version": "1.2.2",
"description": "一个免费的音乐下载助手",
"main": "./dist/electron/main.js",
"productName": "lx-music-desktop",
Expand Down Expand Up @@ -176,7 +176,7 @@
"cross-env": "^7.0.2",
"css-loader": "^4.3.0",
"del": "^6.0.0",
"electron": "^10.1.3",
"electron": "^9.3.2",
"electron-builder": "^22.9.1",
"electron-debug": "^3.1.0",
"electron-devtools-installer": "^3.1.1",
Expand Down
7 changes: 1 addition & 6 deletions publish/changeLog.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
### 优化

- Linux版的软件界面默认使用圆角与阴影,顺便修复了桌面歌词窗口变白的问题,已在Ubuntu 18.10测试正常,若显示异常可尝试添加`-nt`参数启动

### 修复

- 修复聚合搜索的分页问题
- 修复代理输入框输入的内容不生效的问题
- 降级 Electron 到 9.x.x 版本修复 Linux 版桌面歌词窗口变白的问题
2 changes: 1 addition & 1 deletion publish/version.json

Large diffs are not rendered by default.

0 comments on commit c404d3a

Please sign in to comment.