Commit graph

3494 commits

Author SHA1 Message Date
Core
3518542eee
only run on main now 2022-05-02 05:51:11 +01:00
Gabriel Davila
d8ea209123
Merge branch 'ciderapp:develop' into develop 2022-05-02 01:48:38 -03:00
Core
a417e8680f
im a bit dumb 2022-05-02 05:38:37 +01:00
Core
561ee3fe82
is this gonna work 2022-05-02 05:22:41 +01:00
Core
4c2d64ef0d
shit 2022-05-02 05:18:01 +01:00
Core
6940c8bf7e
Fixed the fails 2022-05-02 05:15:22 +01:00
Core
12be570a98
Renamed config var to discordrpc because this migration shit is giving me a headache 2022-05-02 05:09:38 +01:00
Core
47a48673e6
Merge remote-tracking branch 'origin/develop' into develop 2022-05-02 05:04:52 +01:00
child_duckling
7067781041 [connect] cc push 2022-05-01 20:54:06 -07:00
child_duckling
a59a19338e Merge remote-tracking branch 'origin/develop' into develop 2022-05-01 20:39:26 -07:00
child_duckling
5701aea255 [connect] utils function 2022-05-01 20:39:07 -07:00
maikirakiwi
7006ba6175 electron18.2.0 bump 2022-05-01 18:17:08 -07:00
child_duckling
825d1b3bc2 [connect] untested sync backend 2022-05-01 17:54:37 -07:00
Mefsaal
57b59d64c1 im stupid 2022-05-01 18:06:57 -03:00
Monochromish
5ee5eac35a Fixed the weird merging of heart and explicit icons and made a few changes.
In this PR:
* The Explicit and Love icon(s) don't merge and are of same size
* Added Display of unlove icon as well in case song is not loved

Screenshots:
2022-05-02 06:52:07 +10:00
Gabriel Davila
a8ab4581ab
Merge branch 'ciderapp:develop' into develop 2022-05-01 15:56:37 -03:00
cryptofyre
e1c7def8bc
Merge pull request #968 from jay900604/patch-37
Update zh_CN.json
2022-05-01 12:01:26 -05:00
cryptofyre
0da1b60c4b
Merge pull request #959 from umbreon22/limit-large-queue-display
Limits the display of very large queue items to 50 at a time
2022-05-01 12:01:19 -05:00
cryptofyre
8f883c21d3
Merge pull request #960 from umbreon22/check-now-playing-container-for-context-menu
Fix now playing context menu not rendering from 'songs' page
2022-05-01 12:01:01 -05:00
vapormusic
59f0cd7ee2 some cleanup 2022-05-01 22:02:56 +07:00
vapormusic
95e3cab7a5 test 2022-05-01 21:13:36 +07:00
yazninja
ae4a49669a remove right property of heart icon 2022-05-01 20:20:47 +08:00
yazninja
0667fe9d30 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-05-01 19:32:01 +08:00
yazninja
f9f1c053d5 move playIcon style to style.css 2022-05-01 19:31:53 +08:00
vapormusic
d2c2859f26
Merge pull request #972 from ciderapp/feature/aptest
Feature/aptest
2022-05-01 17:42:11 +07:00
vapormusic
c77ce54000 add fail notyf 2022-05-01 17:40:13 +07:00
Mefsaal
b0bf97fcb5 Update Documentation 2022-05-01 07:28:30 -03:00
Mefsaal
d5e142608a linux dont need this 2022-05-01 07:00:49 -03:00
vapormusic
6728c4aa6d
Merge pull request #971 from ciderapp/develop
Develop
2022-05-01 16:50:22 +07:00
vapormusic
3b2c142b54
Merge pull request #970 from ciderapp/feature/aptest
Some casting fixes
2022-05-01 16:48:52 +07:00
Mefsaal
609eb9225f MacOS Localizated only MacOS strings 2022-05-01 06:47:55 -03:00
vapormusic
2deaa22e71 fix some stuffs 2022-05-01 16:45:46 +07:00
Amaru8
e7ef288a91 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-05-01 11:04:20 +02:00
Amaru8
0e2c9a33b9 Make heart icon independent from explicit 2022-05-01 11:04:16 +02:00
Amaru8
75078a564b
Merge pull request #969 from jay900604/patch-38 2022-05-01 09:39:43 +02:00
宥叡
e0127193df
Update zh_CN.json 2022-05-01 14:10:13 +08:00
宥叡
ef05f20534
Update zh_TW.json
Update TW language.
2022-05-01 14:09:09 +08:00
宥叡
c397b2b2b9
Update zh_CN.json
Update CN language.
2022-05-01 14:03:47 +08:00
Mefsaal
0baafbf447 Now works with other languages pending MacOS Strings deletes 2022-04-30 23:22:25 -03:00
Core
3896bd2e36
Update config.yml 2022-05-01 01:57:21 +01:00
Gabriel Davila
54eb414285
Merge branch 'ciderapp:develop' into develop 2022-04-30 19:04:33 -03:00
Amaru8
42569ae9c5 Swap heart with explicit 2022-04-30 22:23:08 +02:00
Amaru8
f5ff731c3f Add Love indicator to albums too 2022-04-30 21:55:54 +02:00
Amaru8
48cce96bea Change else{ to else { 2022-04-30 21:29:44 +02:00
Amaru8
422c869568 Change }else to } else 2022-04-30 21:28:18 +02:00
Amaru8
9c85fafd1d Changed if() to if () 2022-04-30 21:27:00 +02:00
Amaru8
91ac19974c Translate enableQQLyrics to Hungarian 2022-04-30 21:06:25 +02:00
Amaru8
4e22857ccd Align heart icon 2022-04-30 20:21:28 +02:00
Amaru8
3497b65d6a
Merge pull request #966 from ciderapp/feature/heartcolumn
Implemented showing Love Status on the Songs page
2022-04-30 19:49:48 +02:00
Amaru8
70ca60fa43 finally ffs 2022-04-30 19:45:44 +02:00