okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Swiftzerr/Cider

Browse source 
 Conflicts:
	.gitignore
	src/i18n/README.md
	src/i18n/en_OWO.jsonc
	src/i18n/en_PISS.jsonc
	src/i18n/en_SGA.jsonc
	src/i18n/en_US.jsonc
	src/i18n/ja_JP.jsonc
	src/i18n/ko_KR.jsonc
	src/i18n/zh_CN.jsonc
	src/i18n/zh_HK.jsonc
	src/i18n/zh_TW.jsonc
	src/i18n/zh_yue.jsonc
	src/main/base/app.ts
	src/main/base/browserwindow.ts
	src/main/base/store.ts
	src/main/base/utils.ts
	src/main/plugins/thumbar.ts
	src/renderer/audio/audio.js
	src/renderer/index.js
	src/renderer/style.less
	src/renderer/views/app/chrome-top.ejs
	src/renderer/views/pages/settings.ejs
This commit is contained in:
Swiftzerr 2022-02-07 21:18:29 -05:00
commit 4cd7e9729f
42 changed files with 4256 additions and 2573 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -25,7 +25,8 @@
"dist": "yarn build && electron-builder",
"dist:all": "yarn build && electron-builder -mwl",
"msft": "yarn build && electron-builder -c msft-package.json",
"postinstall": "electron-builder install-app-deps"
"postinstall": "electron-builder install-app-deps",
"circle:append-sha": "node resources/appendCommitToVersion"
},
"dependencies": {
"@sentry/electron": "^2.5.4",
@ -34,7 +35,6 @@
"electron-fetch": "^1.7.4",
"electron-log": "^4.4.4",
"electron-notarize": "^1.1.1",
"electron-packager": "^15.4.0",
"electron-store": "^8.0.1",
"electron-updater": "^4.6.1",
"electron-window-state": "^5.0.3",
@ -47,7 +47,6 @@
"music-metadata": "^7.11.4",
"node-gyp": "^8.4.1",
"qrcode": "^1.5.0",
"qrcode-terminal": "^0.12.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"run-script-os": "^1.1.6",