Commit graph

2302 commits

Author SHA1 Message Date
Maikiwi
63962f904b Revert "Merge branch 'innolab' into develop"
This reverts commit b740f76e3c, reversing
changes made to a5746f08fa.
2022-02-17 18:39:38 -08:00
Maikiwi
0297c19a10 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-17 18:39:35 -08:00
Maikiwi
b740f76e3c
Merge branch 'innolab' into develop 2022-02-17 18:38:41 -08:00
Maikiwi
6d964afa2e Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-17 18:34:53 -08:00
Maikiwi
4f9cfc72a2 Update settings.ejs 2022-02-17 18:34:25 -08:00
booploops
a5746f08fa changes to replay graphs 2022-02-17 17:33:14 -08:00
booploops
c611b032cc Generating top genres, made buttons nicer on replay 2022-02-17 17:26:39 -08:00
cryptofyre
90b289e3df Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-17 16:10:43 -06:00
vapormusic
c4edd97d2a improve drag on topbar 2022-02-17 23:43:01 +07:00
vapormusic
476d6d86cf fix 2022-02-17 22:54:53 +07:00
vapormusic
bb92a30cb2 add play button in library-songs page 2022-02-17 22:53:32 +07:00
vapormusic
56387b542c some changes 2022-02-17 20:23:39 +07:00
booploops
8e01d59398 more fancy 2022-02-17 03:26:33 -08:00
booploops
2719b3da4e fancy animations 2022-02-17 03:19:06 -08:00
booploops
bafba68cb2 changed colors 2022-02-17 03:11:06 -08:00
booploops
6ab4b88ed1 replay banner 2022-02-17 03:09:04 -08:00
booploops
d447b41b14 added attributes.playparams.id 2022-02-17 02:16:48 -08:00
booploops
78b03d2cd9 fix for library status 2022-02-17 02:10:31 -08:00
booploops
4e569365f8 replay, added this year 2022-02-17 02:08:28 -08: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
vapormusic
e091287bd6 fix np navigation on some songs 2022-02-17 14:12:23 +07:00
booploops
2d7cc20b69 margin: 0 on song-progress 2022-02-16 23:00:16 -08:00
child_duckling
4b6fdd4a4c change in translation README.md 2022-02-16 20:06:55 -08:00
child_duckling
3b4d9d5512 Added OpenAppData button in settings and updated layout/translations 2022-02-16 20:04:45 -08:00
cryptofyre
22e226d983 Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop 2022-02-16 21:59:47 -06:00
Core
6001dc1a1e
and git can go in the bin too 2022-02-17 03:07:58 +00:00
Maikiwi
b55baecc51 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-02-16 19:07:43 -08:00
Maikiwi
2a7fba307b volume step i18n 2022-02-16 19:07:41 -08: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
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