Commit graph

3782 commits

Author SHA1 Message Date
Mefsaal
a8f3d5683f Merge branch 'develop' of https://github.com/mefsaal/Cider into develop 2022-05-18 14:17:20 -03:00
Mefsaal
f836a3bda1 Documentation and menubar REVERT 2022-05-18 14:17:17 -03:00
Gabriel Davila
b1740b3212
Merge branch 'ciderapp:main' into develop 2022-05-18 12:55:01 -03:00
Mefsaal
992ec792cb SysTray Changes 2022-05-18 12:54:41 -03:00
yazninja
f52c43835c
Merge pull request #1050 from jay900604/patch-42
Update zh_TW.json
2022-05-18 15:09:48 +08:00
Mefsaal
12be8f0ad3 about 2 times 2022-05-18 02:52:24 -03:00
宥叡
d453d5c382
Update zh_TW.json
Update TW language.
2022-05-18 13:42:36 +08:00
yazninja
52c1f22f98 word wrap lyrics 2022-05-18 11:52:18 +08:00
yazninja
9d657013e8 switch artist and album in queue 2022-05-18 10:46:38 +08:00
Gabriel Davila
4853a08498
Merge branch 'ciderapp:main' into develop 2022-05-17 18:56:57 -03:00
Core
b5e68114eb
no 2022-05-17 12:50:03 +01:00
Core
19c882878c
test 2022-05-17 12:44:03 +01:00
yazninja
baaf6234a0
electron 18.2.3 2022-05-17 13:50:16 +08:00
child_duckling
5f07c8309f who tf checked this? Apple's HDG will kill us 2022-05-16 22:36:32 -07:00
Gabriel Davila
acb308692f
Merge branch 'ciderapp:main' into develop 2022-05-16 22:13:49 -03:00
GamingLiamStudios
f39fc9a8ea
Update en_OWO.json 2022-05-17 09:33:36 +10:00
yazninja
ff0251a7a3
use correct adm-zip version 2022-05-17 00:17:29 +08:00
yazninja
b29aa94c01 workflow for main and stable releases 2022-05-16 23:07:55 +08:00
Core
eaae9ba457
Merge branch 'main' into enhancement/radio 2022-05-16 15:57:16 +01:00
yazninja
7ee1116695
Merge Develop into main
Develop -> main
2022-05-16 22:47:45 +08:00
yazninja
166f9b9167 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-05-16 13:58:29 +08:00
yazninja
015d9292f9 update adm-zip and discord-rpc dependencies 2022-05-16 13:58:08 +08:00
yazninja
0316d70b94 resize genres in search page 2022-05-16 13:57:26 +08:00
child_duckling
5d0db127af keyboard combo conflict 2022-05-15 20:45:58 -07:00
child_duckling
502a3af68e Merge remote-tracking branch 'origin/develop' into develop 2022-05-15 20:42:25 -07:00
child_duckling
31ad899f98 fix keyboard combos for mac. who tf uses Option+S for settings? 2022-05-15 20:42:14 -07:00
Gabriel Davila
cb71bf3d6d
Merge branch 'ciderapp:develop' into develop 2022-05-15 14:39:05 -03:00
vapormusic
fd20acdd87
Merge pull request #1044 from ciderapp/develop
Develop
2022-05-15 16:56:01 +07:00
vapormusic
8d9ac86514
Merge branch 'main' into develop 2022-05-15 16:55:54 +07:00
vapormusic
07ea88323f some fixes 2022-05-15 16:52:41 +07:00
Amaru8
2b180daa63
Remove 256 kbps from Hungarian 2022-05-15 10:10:23 +02:00
Amaru8
c27d45273e
Translated some strings to Hungarian 2022-05-15 10:07:36 +02:00
Gabriel Davila
6cf67da792
Merge branch 'ciderapp:develop' into develop 2022-05-15 04:14:07 -03:00
vapormusic
b9e3939482 ok 2022-05-15 13:57:54 +07:00
vapormusic
ccae1098fc fix airplay not working sometimes 2022-05-15 13:47:35 +07:00
yazninja
392b5a20a8 restyled music videos 2022-05-15 14:47:18 +08:00
maikirakiwi
e584cf35d2 silent i18n change 2022-05-14 22:44:14 -07:00
maikirakiwi
a8946afc49 javascript hates me 2022-05-14 22:15:48 -07:00
maikirakiwi
8d6ec8cd28 CAP aggressive sucks giant pp 2022-05-14 21:13:19 -07:00
maikirakiwi
645901df79 slight norm adjustment 2022-05-14 17:58:18 -07:00
Mefsaal
b4d6ead422 Merge branch 'develop' of https://github.com/mefsaal/Cider into develop 2022-05-14 18:00:06 -03:00
Mefsaal
199dd45b58 some test 2022-05-14 18:00:02 -03:00
vapormusic
ddeb299317 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-05-15 00:14:51 +07:00
vapormusic
e21dd2738c better video controls 2022-05-15 00:14:36 +07:00
cryptofyre
aab5d0e91a
Electron 18.2.3 bump 2022-05-14 10:24:52 -05:00
vapormusic
728904d145
Merge pull request #1043 from Monochromish/develop
Make Pin button on MiniPlayer interactive.
2022-05-14 21:21:50 +07:00
Monochromish
b887aee8fc Make Pin button on MiniPlayer interactive. 2022-05-14 23:51:17 +10:00
vapormusic
8da51134b2 Merge branch 'develop' of https://github.com/ciderapp/Cider into develop 2022-05-14 17:51:03 +07:00
vapormusic
7a71713a7f some fixes 2022-05-14 17:50:43 +07:00
cryptofyre
34c9214f35
Update package.json 2022-05-14 00:02:42 -05:00