1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Commit graph

18 commits

Author SHA1 Message Date
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
Afterster
5124a5ed4c Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
2015-11-07 08:08:59 +01:00
unknown
c060cc1746 Added functionality for streaming playlists to support track numbers:
* new column 'track_num' added to table stream_playlist
* added new item 'track_num' to properties array within Stream_URL
* added track number for xspf playlist format
2015-08-05 17:07:37 -06:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
1d0b9d483c Fix song download link with beautiful url settings enabled 2014-07-05 10:10:08 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
SUTJael
2a82a834f4 Use base url in webplayer with beautiful url setting 2014-04-22 18:29:32 +02:00
SUTJael
598464f114 Add some logs to transcode settings 2014-04-18 20:04:45 +02:00
Afterster
c12db91106 Fix beautiful url when url query string begin with ?& 2014-04-06 22:50:32 +02:00
Afterster
355f6885c7 Add beautiful stream url setting and clear playlist before playing in localplay mode 2014-01-11 15:00:52 +01:00
Afterster
beae0b97a2 Remove jPlayer for live stream and add Muses Radio Player 2013-11-23 15:57:43 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Paul Arthur
a45b564d02 Fix Stream_URL::parse()
Also fixes democratic voting.
2013-04-13 15:07:33 -04:00
Paul Arthur
239ea81fdf Some cleanup of play URL handling
Move parsing from Song into Stream_URL and make it parse more things.
Add the type parameter to all generated URLs instead of adding video to
Video URLs.
2013-02-07 14:24:40 -05:00
Paul Arthur
ef4d366060 Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference
for spaces, and I feel inclined to impose my will on the tree.
2013-01-26 03:38:46 -05:00
Paul Arthur
16c3ba34fd Cosmetics: clean up heads in lib/ 2013-01-25 18:38:22 -05:00
Paul Arthur
a1594882c7 Add Stream_URL class for passing them around 2013-01-15 01:26:38 -05:00