Commit Graph

61 Commits

Author SHA1 Message Date
Daniel Løvbrøtte Olsen
9b0bb1b710 Merge branch 'patch-1' into 'master'
Updates docker-compose.yml from traefik v1 to v2

See merge request dodsorfas/Radio-dodsorfas!11
2019-11-09 21:02:12 +00:00
Joakim Pettersvold
ec6c0826c2 Updates docker-compose.yml from traefik v1 to v2 2019-11-09 21:02:12 +00:00
root
c81c711728 Merge branch 'master' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas 2019-11-09 21:04:35 +01:00
root
2b1e0059cd update radio 2019-11-09 21:04:14 +01:00
Daniel Løvbrøtte Olsen
9cfb66d9e6 Remove 15 minute long He's a pirate 2019-06-05 16:07:05 +00:00
Daniel Løvbrøtte Olsen
ee96d8bcc7 remove 6zv3HmPxSZk Where do I begin, excessive noise at end.
annoying, otherwise good song
2019-06-02 19:12:02 +00:00
Daniel Løvbrøtte Olsen
f926b44cdb Update hackin-slashing.m3u 2018-11-15 20:59:00 +00:00
Daniel Løvbrøtte Olsen
77a06eba36 Update best_of_shit.m3u 2018-11-14 12:37:45 +00:00
Daniel Løvbrøtte Olsen
c44d08d5fa Removed radio active because of noise 2018-11-05 13:45:41 +00:00
Daniel Løvbrøtte Olsen
71b7e5b2e6 Update best_of_shit.m3u 2018-11-03 12:20:34 +00:00
Daniel Løvbrøtte Olsen
48508cd8ae Fix cyber's colon 2018-11-03 00:09:47 +00:00
Daniel Løvbrøtte Olsen
ca2ce5237d Add slice the snake to anime mashups 2018-11-03 00:07:11 +00:00
Daniel Løvbrøtte Olsen
e6a8039546 Update Anime-mashups.m3u 2018-11-03 00:04:08 +00:00
root
ef02fecaa8 Lots of small additions 2018-11-02 23:59:32 +00:00
root
d3520d8ebb woopsiesdipse 2018-10-22 15:48:41 +00:00
Daniel Løvbrøtte Olsen
1a19711f91 Update playlist.php 2018-10-22 12:41:45 +00:00
Daniel Løvbrøtte Olsen
dd1b35a631 Remove some the 4-5 digit long songs lol 2018-10-22 11:16:39 +00:00
root
e5690dd64b fix script 2018-10-22 11:14:25 +00:00
root
e3b1ea7a05 Merge branch 'master' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas 2018-10-21 18:31:08 +00:00
Daniel Løvbrøtte Olsen
529349a46d Merge branch 'develop' into 'master'
Develop

See merge request Dandellion/Radio-dodsorfas!10
2018-10-21 18:30:52 +00:00
root
fbe1158c2d nani 2018-10-21 18:30:12 +00:00
root
2a7174c96f Merge branch 'develop' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas into develop 2018-10-21 18:08:01 +00:00
root
7dc7f52afb nani desu ne 2018-10-21 18:07:53 +00:00
Daniel Løvbrøtte Olsen
6370729103 Merge branch 'develop' into 'master'
Develop

See merge request Dandellion/Radio-dodsorfas!8
2018-10-21 18:06:25 +00:00
Joakim Pettersvold
8e1d7513a4 Merge branch 'master' into 'develop'
Added songs to playlists

See merge request Dandellion/Radio-dodsorfas!7
2018-10-21 18:05:52 +00:00
Joakim Pettersvold
1155d3d1d6 Added songs to playlists:
events/Halloween.m3u
normal/artists/AstridS.m3u
2018-10-21 20:01:23 +02:00
Daniel Løvbrøtte Olsen
232688c108 Merge branch 'develop' into 'master'
Develop

See merge request Dandellion/Radio-dodsorfas!6
2018-10-21 12:20:45 +00:00
root
c53213ab05 fuck this im cheatin 2018-10-21 12:18:53 +00:00
Daniel Løvbrøtte Olsen
b393a47268 add header to generated m3u files 2018-10-21 10:56:31 +00:00
root
f94e50478a clean up 2018-10-21 10:53:10 +00:00
root
de61d3abe9 megaplaylist 2018-10-20 21:58:40 +00:00
Daniel Løvbrøtte Olsen
7a0f7ca332 adsads 2018-10-16 15:55:04 +02:00
Daniel Løvbrøtte Olsen
a54e9bafc2 adsads 2018-10-16 15:32:30 +02:00
Daniel Løvbrøtte Olsen
3407dc8af9 fix eroor 2018-10-16 15:28:36 +02:00
Daniel Løvbrøtte Olsen
fc8e0be159 fix eroor 2018-10-16 15:25:47 +02:00
Daniel Løvbrøtte Olsen
28b80b7f95 start debug, one playlist 2018-10-16 15:21:16 +02:00
Daniel Løvbrøtte Olsen
68f53e4f7e Merge branch 'develop' into 'master'
fix errir

See merge request Dandellion/Radio-dodsorfas!5
2018-10-15 17:16:31 +00:00
Daniel Løvbrøtte Olsen
a48ed8e0c5 fix errir 2018-10-15 19:16:01 +02:00
Daniel Løvbrøtte Olsen
54a0a5ab59 Merge branch 'develop' into 'master'
Develop

See merge request Dandellion/Radio-dodsorfas!4
2018-10-15 17:01:12 +00:00
Daniel Løvbrøtte Olsen
801fb3b391 conservative try 2018-10-15 19:00:03 +02:00
Daniel Løvbrøtte Olsen
22ef55f130 Merge branch 'master' into 'develop'
More content

See merge request Dandellion/Radio-dodsorfas!3
2018-10-15 15:32:42 +00:00
Joakim Pettersvold
0a919ca617 Uncomments Halloween in main.liq for halloween event
The event is real!!!!
2018-10-15 06:26:12 +00:00
Joakim Pettersvold
04c5730c26 Added playlists (and songs), and removed -x protocol on playlists maintained by Joakim
+JoakimRemixes.m3u
+Halloween.m3u
*JoakimDiverse.m3u(Added songs)
*AstridS.m3u(Added songs)

Added JoakimRemixes and Halloween to main.liq (Halloween is commented)
2018-10-13 22:34:30 +02:00
root
7e030fbf4e change all protocols in playlists to the new -x protocol 2018-10-04 18:03:37 +00:00
root
a56119d04f Merge branch 'master' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas 2018-10-04 17:59:48 +00:00
root
acf358317d Add youtube-dl-x protocol, reduces CPU usage MASSIVELY 2018-10-04 17:57:39 +00:00
Daniel Løvbrøtte Olsen
60455448b7 Update Dan - Edgy Music YT.m3u 2018-09-30 13:37:47 +00:00
root
144cc07189 Add all current playlists to shuffle 2018-09-29 21:08:11 +00:00
root
6b85d15258 remove weeb stream 2018-09-27 22:37:07 +00:00
Daniel Løvbrøtte Olsen
553a746a69 Merge branch 'master' into 'master'
Adds my youtube playlists so far

See merge request Dandellion/Radio-dodsorfas!1
2018-09-27 20:43:07 +00:00