Commit graph

324 commits

Author SHA1 Message Date
booploops
02ba9a7c42 Added resume from history 2022-02-19 01:13:22 -08:00
child_duckling
2991a92b68 remote testing on dev env and nodeintegration on webview 2022-02-19 00:34:15 -08:00
Maikiwi
858c283bcc failsafes and fixed buttons 2022-02-19 00:19:16 -08:00
booploops
4d18080395 Added dirName 2022-02-18 22:34:43 -08:00
booploops
a42a88ad6c support for nested files in themes, added /plugins 2022-02-18 21:43:07 -08:00
booploops
c9f17a71bd adds audiolabs 2022-02-18 19:03:30 -08:00
booploops
451e25f071 added onRendererReady 2022-02-18 17:09:29 -08:00
booploops
e2a8b803e5 Added loadJSFrontend 2022-02-18 16:46:40 -08:00
Maikiwi
6638e2dc04
Innolab Merger (#479)
* Sync I don't commit now is the conflict of tomorrow (#477)

* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* Revert "Merge branch 'ciderapp:develop' into develop"

This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.

* lastfm changes

* i hate lastfm

like really really
hate
it

* Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 5b360e74fa, reversing
changes made to 548688341d.

* Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""

This reverts commit 0fb6802ff3.

* Revert "Merge branch 'develop' of https://github.com/ciderapp/Cider into develop"

This reverts commit bd3a2b6172, reversing
changes made to 0fb6802ff3.

* volume step i18n

* and git can go in the bin too

* Added OpenAppData button in settings and updated layout/translations

* change in translation README.md

* margin: 0 on song-progress

* fix np navigation on some songs

* enables native linux chrome

* replay wip

* replay, added this year

* fix for library status

* added attributes.playparams.id

* replay banner

* changed colors

* fancy animations

* more fancy

* some changes

* add play button in library-songs page

* fix

* improve drag on topbar

* Generating top genres, made buttons nicer on replay

* changes to replay graphs

* Revert "Merge branch 'innolab' into develop"

This reverts commit b740f76e3c, reversing
changes made to a5746f08fa.

* added force-video to mediaitem-square

* Update zh_TW.jsonc (#468)

Update TW language.

Co-authored-by: Maikiwi <stella@mai.kiwi>

* Update zh_TW.jsonc

* frontend plugins first iteration

* trans prep

* macOS transparency

* fix playlist on listen now

* fix #474

* ok

* back button & media keys improvement

* ok

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>

* refactored specialty settings and switch for two spatialization

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>
2022-02-18 14:47:27 -08:00
Maikiwi
873d234999
Merge branch 'innolab' into develop 2022-02-18 14:02:42 -08:00
vapormusic
bb8e22cf93 back button & media keys improvement 2022-02-18 22:50:02 +07:00
booploops
231936c0c7 macOS transparency 2022-02-17 22:45:59 -08:00
child_duckling
dd879b46c5 trans prep 2022-02-17 22:26:51 -08:00
booploops
66ca32bd1d frontend plugins first iteration 2022-02-17 22:12:22 -08:00
Maikiwi
ecfdeece64 Merge branch 'innolab' of https://github.com/ciderapp/Cider into innolab 2022-02-17 19:20:45 -08:00
Maikiwi
8ee22f615d
Sync I don't commit now is the conflict of the tomorrow (#472)
* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* Revert "Merge branch 'ciderapp:develop' into develop"

This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.

* lastfm changes

* i hate lastfm

like really really
hate
it

* Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 5b360e74fa, reversing
changes made to 548688341d.

* Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""

This reverts commit 0fb6802ff3.

* Revert "Merge branch 'develop' of https://github.com/ciderapp/Cider into develop"

This reverts commit bd3a2b6172, reversing
changes made to 0fb6802ff3.

* volume step i18n

* and git can go in the bin too

* Added OpenAppData button in settings and updated layout/translations

* change in translation README.md

* margin: 0 on song-progress

* fix np navigation on some songs

* enables native linux chrome

* replay wip

* replay, added this year

* fix for library status

* added attributes.playparams.id

* replay banner

* changed colors

* fancy animations

* more fancy

* some changes

* add play button in library-songs page

* fix

* improve drag on topbar

* Generating top genres, made buttons nicer on replay

* changes to replay graphs

* Revert "Merge branch 'innolab' into develop"

This reverts commit b740f76e3c, reversing
changes made to a5746f08fa.

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
2022-02-17 18:41:29 -08:00
vapormusic
56387b542c some changes 2022-02-17 20:23:39 +07:00
booploops
6f975a3394 replay wip 2022-02-17 01:56:13 -08:00
booploops
90ad36d256 enables native linux chrome 2022-02-17 00:43:19 -08:00
child_duckling
3b4d9d5512 Added OpenAppData button in settings and updated layout/translations 2022-02-16 20:04:45 -08:00
Core
6001dc1a1e
and git can go in the bin too 2022-02-17 03:07:58 +00:00
Core
4bed3ca783
Revert "Merge branch 'develop' of https://github.com/ciderapp/Cider into develop"
This reverts commit bd3a2b6172, reversing
changes made to 0fb6802ff3.
2022-02-17 03:06:30 +00:00
Core
35aa69c2d6
Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""
This reverts commit 0fb6802ff3.
2022-02-17 03:06:27 +00:00
Core
bd3a2b6172
Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-17 03:02:25 +00:00
Core
0fb6802ff3
Revert "Merge remote-tracking branch 'origin/develop' into develop"
This reverts commit 5b360e74fa, reversing
changes made to 548688341d.
2022-02-17 03:02:16 +00:00
Core
0c0eac290a
Merge branch 'develop' into develop 2022-02-17 03:01:29 +00:00
Core
5b360e74fa
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/main/plugins/lastfm.ts
2022-02-17 02:58:25 +00:00
Core
548688341d
i hate lastfm
like really really
hate
it
2022-02-17 02:56:41 +00:00
Maikiwi
d2a776c76e Merge branch 'innolab' of https://github.com/ciderapp/Cider into innolab 2022-02-16 18:45:07 -08:00
Maikiwi
509a425f41
sync again (#465)
* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* lastfm changes

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
2022-02-16 18:44:34 -08:00
vapormusic
1ad805c04e lastfm changes 2022-02-17 09:22:36 +07:00
Core
7f5ad08da3
Revert "Merge branch 'ciderapp:develop' into develop"
This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.
2022-02-17 01:16:31 +00:00
Core
cb82ff482d
Revert "Revert "LastFM can be unique and have its own call""
This reverts commit f156083d48.
2022-02-17 01:06:47 +00:00
Core
604ef16db8
Revert "Merge branch 'develop' into develop"
This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.
2022-02-17 01:05:52 +00:00
Core
f156083d48
Revert "LastFM can be unique and have its own call"
This reverts commit d36e1b19f6.
2022-02-17 01:01:17 +00:00
Core
51393397e5
Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 00:58:54 +00:00
Core
d36e1b19f6
LastFM can be unique and have its own call 2022-02-17 00:58:48 +00:00
Core
5fa345e6c8
Merge branch 'develop' into develop 2022-02-17 00:23:52 +00:00
Core
09825e93d3
Created audio controls menu 2022-02-17 00:19:14 +00:00
Maikiwi
3e38e32119 temp disable auto upd 2022-02-15 19:29:29 -08:00
Maikiwi
182e4a0611 debug messages and adding switches 2022-02-15 19:23:35 -08:00
Maikiwi
24970d1712 Merge branch 'innolab' of https://github.com/ciderapp/Cider into innolab 2022-02-15 18:33:22 -08:00
Maikiwi
3e28d65fab fix i'm blind 2022-02-15 18:33:17 -08:00
Maikiwi
453ebc2519
sync (#461)
* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* fix #459

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
2022-02-15 18:32:51 -08:00
Core
ad86f58e47
Linux frame 2022-02-15 14:53:51 +00:00
Core
04591e605c
Removed Discord clear on pause 2022-02-15 14:35:56 +00:00
child_duckling
237d20ff6d Added update check if using MSS or MAS builds. need help implementing 2022-02-14 22:08:24 -08:00
Core
dfe846cff0
Merge pull request #446 from ChaseIngebritson/scrobbling-and-name-fix
Scrobbling "and" in name fix
2022-02-14 13:32:51 +00:00
Core
3653937f69
Fixed the mk reference 2022-02-14 13:31:11 +00:00
Core
3466869a34
Fix the ts error 2022-02-14 13:00:59 +00:00