yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 02:09:23 +02:00
Code Issues Releases Wiki Activity
4577 commits 4 branches 18 tags 116 MiB
Commit graph

66 commits

Author SHA1 Message Date
Afterster
baaceca250 Add Podcast feature 2015-12-20 23:19:23 +01:00
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
Afterster
207076d9a0 Merge branch 'develop' of https://github.com/Niols/ampache into Niols-develop 
Conflicts:
	admin/users.php
	config/ampache.cfg.php.dist
	lib/class/api.class.php
	lib/class/userflag.class.php
	lib/rating.lib.php
	lib/ui.lib.php
	sql/ampache.sql
	templates/browse_filters.inc.php
	templates/footer.inc.php
	templates/header.inc.php
	templates/show_albums.inc.php
	templates/show_artists.inc.php
	templates/show_broadcasts.inc.php
	templates/show_catalogs.inc.php
	templates/show_channels.inc.php
	templates/show_concerts.inc.php
	templates/show_democratic_playlist.inc.php
	templates/show_html5_player_headers.inc.php
	templates/show_index.inc.php
	templates/show_install_config.inc.php
	templates/show_labels.inc.php
	templates/show_live_streams.inc.php
	templates/show_localplay_playlist.inc.php
	templates/show_login_form.inc.php
	templates/show_manage_license.inc.php
	templates/show_manage_shoutbox.inc.php
	templates/show_missing_albums.inc.php
	templates/show_objects.inc.php
	templates/show_playlist_songs.inc.php
	templates/show_playlists.inc.php
	templates/show_preferences.inc.php
	templates/show_pvmsgs.inc.php
	templates/show_recommended_artists.inc.php
	templates/show_searches.inc.php
	templates/show_shared_objects.inc.php
	templates/show_song_previews.inc.php
	templates/show_songs.inc.php
	templates/show_tvshow_seasons.inc.php
	templates/show_tvshows.inc.php
	templates/show_user_activate.inc.php
	templates/show_users.inc.php
	templates/show_videos.inc.php
	templates/show_wanted_albums.inc.php
	templates/sidebar.inc.php
	templates/stylesheets.inc.php
 2015-09-06 11:23:51 +02:00
Afterster
73879d089c Fix stream playlist wrong object use 2015-09-04 07:25:47 +02:00
Afterster
582bbbb188 Implements bin/write_playlists.inc tool to export playlists/artists/albums to playlist files (x2) 2015-09-03 23:47:20 +02: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
Niols
a1f6a073cb Use UI::find_template everytime there's a '/templates/…' 
Note: This concerns everything but the install files
 2015-06-06 18:54:05 +02:00
Afterster
d22e638dbc Add repeat automatically when playing democratic on localplay (fix #233) 
Fix ampache.sql ACL insertion
Set API Key QRCode size to 128x128 px
 2015-02-05 23:20:39 +01:00
Afterster
a9d74c58ad Set image thumb size in playlist item directly 2015-02-02 07:44:00 +01:00
thinca
21a6d42353 Fix Content-Type of asx 2015-01-12 13:44:57 +09:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015 
janitorial services
 2015-01-04 21:36:41 +00:00
Tan Chee Eng
7c5ec76f51 First draft for "Play Next" feature 2014-12-31 11:06:51 +08:00
SUTJael
5ff1ca45f8 Overlay notifications updated. 2014-11-13 15:29:42 +01:00
Afterster
2c221e8216 Add user geolocation and user statistical graphs 2014-10-06 01:05:17 +02:00
Afterster
a157856675 Add user feedback near mouse cursor when voting to a song (democratic playlist) 2014-10-01 22:17:31 +02:00
Afterster
49cd42562b Replace iframe with Ajax page loading :) :) 2014-08-08 01:36:07 +02:00
Afterster
993e5f9fa8 Add hls stream 
Improve Plex video stream & transcode
 2014-08-04 01:33:44 +02:00
Afterster
daa8b3133b Add video subtitle support 
Add local_web_path setting (fix #324)
 2014-07-16 22:41:19 +02:00
Afterster
7258fdcb63 Add video image preview 2014-07-08 09:05:45 +02:00
Afterster
1d0b9d483c Fix song download link with beautiful url settings enabled 2014-07-05 10:10:08 +02:00
Afterster
b4e932c741 Fix 'Ampache User' on broadcasts (fix #244) and broadcast initial song position (fix #243) 
Add access-control header and remove JSON xmlns attribute on Subsonic API
 2014-06-10 06:20:56 +02:00
Afterster
25fd367ea3 Fix radio play 2014-06-01 15:04:06 +02:00
Afterster
6b3fb8fa7b Don't add disabled media to a stream playlist 2014-05-26 07:55:24 +02:00
Afterster
fee1e70ffa Fix scrutinizer code style 2014-05-26 00:48:43 +02:00
Afterster
b16958f44e Remove old code and fix old php errors 2014-05-25 22:54:04 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
SUTJael
39e6e76f59 Fix code style 2014-05-07 15:49:47 +02:00
SUTJael
13544400a4 Fix m3u urls by using the transcoding file type instead of real type when required 2014-04-19 12:03:42 +02:00
Afterster
f8de5b09f9 Add 'Play Last' to Localplay modules 2014-03-29 08:15:57 +01:00
Afterster
9abed639d8 Add load time in footer and set catalog disable as an option to not increase sql query by default 2014-03-16 10:02:13 +01:00
Afterster
99c975726c Fix album art on xspf playlist stream and add concerts settings 2014-03-16 00:51:01 +01:00
Afterster
c234f99692 Add custom buttons play actions 2014-02-15 13:09:12 +01:00
Afterster
6cdb33ae32 Working Broadcast feature 2014-02-09 23:00:50 +01:00
Afterster
e0a1443566 Add UI for Channels 2014-02-03 07:24:13 +01:00
Afterster
8d7ce473d0 Add share feature 2014-01-15 23:55:19 +01: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
26b0320c4a Add song previews on missing albums, EchoNest API support 2013-12-28 16:40:35 +01:00
Afterster
5eceaf2aea Rename Config class to AmpConfig class to avoid conflict with PEAR (fix #68) 2013-12-13 08:36:23 +01:00
Afterster
d0726e70b7 Fix code style 2013-12-13 00:30:52 +01:00
Afterster
19dd53127e Option to add items to the currently played web player playlist (fix #71) 2013-12-13 00:30:30 +01:00
Afterster
beae0b97a2 Remove jPlayer for live stream and add Muses Radio Player 2013-11-23 15:57:43 +01:00
Afterster
e35f175a4b Rename HTML5 Player to Web Player 2013-11-23 13:50:29 +01:00
Afterster
fdc8721334 Fix playlist item type definition and prepare html5 player for specific web radio stuff 2013-11-22 00:13:32 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Afterster
c634d779d3 Only one HTML5 player in the list. Popup or Iframe version according to user setting. 2013-11-09 13:32:54 +01:00
Afterster
99ad5f7f82 HTML5 player replaced by JPlayer and add an iframed version of the player 2013-11-09 13:32:47 +01:00
thinca
0391d24438 Set Encoding parameter in ASX files 
dd563989%28v=vs.85%29.aspx
 2013-06-04 12:23:49 -04:00
Paul Arthur
a90c666801 Cosmetic cleanup of the ASX output 2013-06-04 12:23:13 -04:00