Commit graph

2154 commits

Author SHA1 Message Date
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
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
20fd0c05da
Merge branch 'ciderapp:develop' into develop 2022-02-17 01:10:07 +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
4937e29fcf
Merge pull request #1 from ciderapp/develop
Develop
2022-02-17 00:29:50 +00:00
Core
5fa345e6c8
Merge branch 'develop' into develop 2022-02-17 00:23:52 +00:00
Core
a02b633f49
shitty floats shitty shitty 2022-02-17 00:20:18 +00:00
Core
64c7d53f07
Added start-renderer command for easier testing 2022-02-17 00:19:32 +00:00
Core
09825e93d3
Created audio controls menu 2022-02-17 00:19:14 +00:00
Core
16c0f8408f
Merge branch 'ciderapp:develop' into develop 2022-02-16 14:35:27 +00:00
vapormusic
edf5e43416 fix adding/remove mvs from library 2022-02-16 14:03:59 +07:00
vapormusic
3772399c01 ok 2022-02-16 13:23:59 +07:00
vapormusic
0ec0909697 Revert "ok?"
This reverts commit 9218ccc887.
2022-02-16 13:23:09 +07:00
vapormusic
9218ccc887 ok? 2022-02-16 13:22:48 +07:00
vapormusic
209d3889fb Revert "revert"
This reverts commit 24313b53cf.
2022-02-16 13:21:09 +07:00
vapormusic
cd6a5ac10d Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-16 13:04:45 +07:00
vapormusic
24313b53cf revert 2022-02-16 13:04:40 +07:00
booploops
db89ab7a60 exposed --songProgressColor and --songProgressBackground 2022-02-15 19:39:53 -08:00
Core
b57a544cd8
Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 17:11:11 +00:00
Core
2f3fda5235
Fix 2022-02-15 17:11:04 +00:00
Core
35a056d6d6
Merge branch 'ciderapp:develop' into develop 2022-02-15 16:06:42 +00:00
vapormusic
b7418b9651 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-15 23:00:32 +07:00
vapormusic
f58ceeb14c fix #459 2022-02-15 23:00:22 +07: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
vapormusic
6c1c20a0d9
Merge pull request #455 from JYW0803/patch-1
Also copy blockmap for partial download
2022-02-15 17:50:01 +07:00
vapormusic
dd49b0eb6b more lang fix 2022-02-15 16:34:42 +07:00
JYW0803
cb8c41d379
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)`
2022-02-15 17:30:31 +08:00
vapormusic
6d9768230f oops 2022-02-15 13:33:25 +07:00
vapormusic
34c956fe99 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-15 13:30:36 +07:00
vapormusic
13a1f1951f fix locale / allow pl to show before list loading is fully done 2022-02-15 13:30:31 +07:00
child_duckling
237d20ff6d Added update check if using MSS or MAS builds. need help implementing 2022-02-14 22:08:24 -08:00
宥叡
3a7b5d8655
Update zh_TW.jsonc (#454)
Update the TW language of GitHub Themes.
2022-02-14 21:13:13 -08:00
Maikiwi
67f7af2ca5 well okay instead of hiding it and have people complain might as well as only disabling the switch 2022-02-14 11:57:23 -08:00
Maikiwi
3af828aa0e might as well as hide the option 2022-02-14 11:54:08 -08:00
Bill Zhang
6141a33037
Update zh_CN.jsonc (#451) 2022-02-14 10:41:41 -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