Commit graph

291 commits

Author SHA1 Message Date
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
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
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
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
booploops
f655b8f1aa checking if theme is already installed 2022-02-14 00:36:48 -08:00
booploops
a6710486d6 github themes 2022-02-13 23:04:29 -08:00
vapormusic
ade11cd717
Update lastfm.ts 2022-02-14 08:14:27 +07:00
Chase Ingebritson
a804234646 Added a network request to pull artist names on scrobbling 2022-02-13 18:01:43 -06:00
vapormusic
942aa1b1b4 skipToPreviousItem bug mitigation 2022-02-13 19:08:31 +07:00
vapormusic
7317a1ad6f fix 2022-02-13 17:54:00 +07:00
vapormusic
317a56e439 mitigate skipping on some library songs 2022-02-13 17:51:58 +07:00
vapormusic
5c56dfbcc3 rpc library images working now 2022-02-13 17:24:01 +07:00
vapormusic
2336b85291 rpc library images ( need api to work first) 2022-02-13 00:07:16 +07:00
child_duckling
31783d30d2 Added Quack language for the memes 2022-02-11 21:43:45 -08:00
booploops
6b5cc68f6a Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-11 19:46:19 -08:00
booploops
a6abb536e4 theme.json is now read if present 2022-02-11 19:46:12 -08:00
child_duckling
6cbb472c35 [MAS] adjust for macOS design standards 2022-02-11 19:37:09 -08:00
booploops
e3555b7b01 added install from github url to settings 2022-02-11 19:20:29 -08:00
booploops
0aaa40f4e5 if theme folder does not exist create one 2022-02-11 19:07:05 -08:00
booploops
fb65965d82 added ipcRenderer.send("get-github-theme", "url") 2022-02-11 19:05:59 -08:00
booploops
6eba2cfdd2 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-11 17:21:55 -08:00
booploops
d6d93ed3b7 themes can now be in folders and have resources in those folders 2022-02-11 17:21:47 -08:00
vapormusic
b3efe18f82 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-12 08:20:08 +07:00
vapormusic
1e2978199e tmp 2022-02-12 08:19:58 +07:00
booploops
7df1b9ba16 Themes in settings will now only display less files 2022-02-11 17:06:59 -08:00
vapormusic
391a9f42f4 stop bonking the app qwack 2022-02-11 21:09:41 +07:00
booploops
5f1326be80 re-did version string in about using vue, fixed window not launching on yarn start under win10 2022-02-11 01:37:42 -08:00
child_duckling
f20e59d52e handoff and version viewing in about.ejs 2022-02-10 22:11:00 -08:00
vapormusic
bed6548fc1 fix locale in now playing 2022-02-10 22:16:15 +07:00
vapormusic
f71a22b8e9 lastfm 2022-02-10 16:41:26 +07:00
vapormusic
f4dda32e12 attempt to fix lastfm 2022-02-10 15:59:57 +07:00
vapormusic
cff266c9df attempt to fix lastfm 2022-02-10 15:53:31 +07:00
vapormusic
cf7813142e webview pair-remote 2022-02-10 13:34:04 +07:00
booploops
62ac278a85 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-09 17:22:00 -08:00
Jozen Blue Martinez
75221bc984
Update WebNowPlaying plugin. (#405)
* [WebNowPlaying] Remove unnecessary .bind, general code and type cleanup

* bleh

* bleh 2
2022-02-09 10:12:59 -08:00
vapormusic
6ea19e49f7 better spacebar control, disable it completely in dev mode 2022-02-09 23:33:42 +07:00
Core
47e25ae2f2
This is gonna get annoying 2022-02-09 15:51:18 +00:00