1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 01:39:28 +02:00
Commit graph

56 commits

Author SHA1 Message Date
Phyks (Lucas Verney)
e86ea9a099 Fix copyright date 2016-08-01 22:02:00 +02: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
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
2835e4c330 Add delete from disk setting and delete actions on most library items 2015-04-26 09:55:14 +02:00
Afterster
a4eafa834d Fix few french translation
Avoid player exit confirmation on download links
Fix song removal from user uploader
2015-04-21 19:56:36 +02:00
Afterster
fe3239f0c1 Add delete from disk option on user uploaded files (fix #388)
Fix file upload duplicate insertion when uploading multiple files at once
2015-01-31 22:06:46 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02: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
f739396d49 Re-add song lyrics support, with plugins (currently LyricWiki only). Fix #47 2013-11-24 13:29:13 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01: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
04aa79b53c Move show_{footer,header}() from ui.lib.php to UI 2013-01-26 01:22:50 -05:00
Paul Arthur
9a83f50042 Consistently use require_once to load init.php 2013-01-25 19:10:43 -05:00
Paul Arthur
b7d00ceeb4 Cosmetics: clean up heads in / 2013-01-25 15:40:47 -05:00
Paul Arthur
4e247196ff Rip out ugly lyrics code 2012-11-13 18:51:11 -05:00
Paul Arthur
f65076b93d Switch from _() to T_()
Even if we move away from php-gettext in the future, it's easy to
write a quick T_() as a simple wrapper; it's not so easy to rewrite
PHP to allow redeclaration of a function.
2012-04-12 21:13:29 -04:00
Paul Arthur
4aa256cb07 Clean up some PHPDoc crap
Remove misleading, unvetted, or in some cases just plain wrong data.
Packages and categories weren't being used correctly.  They still
aren't.
2011-04-04 17:37:10 -04:00
momo-i
aee809f1dc header comment replace for phpdoc 2011-02-03 10:07:39 +09:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
dipsol
25fab47331 added link from now playing to the lyrics 2009-05-26 13:24:58 +00:00
momo-i
2789846584 Add Hint for translators 2009-05-19 00:45:51 +00:00
momo-i
8c56f72e4b Fixed: 1 line lyrics for insert db 2009-03-16 10:54:42 +00:00
momo-i
5d1704555a Added: Lyrics wiki link on show song page 2009-03-11 22:59:06 +00:00
momo-i
11a5195bc5 forgot commit (show lyrics) 2009-03-11 08:14:49 +00:00
momo-i
14ef536151 Add: song_lyrics to Ampache #327 (thx alister55) 2009-02-24 04:18:33 +00:00
Karl 'vollmerk' Vollmer
efd932b9fd fixed some copyright lines and removed unused file 2008-05-08 06:10:17 +00:00
Karl 'vollmerk' Vollmer
ab6ecea9db added single song view 2007-11-13 04:31:50 +00:00
Karl 'vollmerk' Vollmer
a31560aec4 it technically logs in and streams.. but thats it, complete rewrite almost everything broken 2007-04-23 07:31:05 +00:00
Karl 'vollmerk' Vollmer
0fbaabb4c3 stll some faulty french translations but its a little better 2007-01-24 08:59:59 +00:00
Karl 'vollmerk' Vollmer
56ce11f771 added config version check, fixed play selected bug reported by chenb and fixed wmp11 now playing issue 2007-01-22 08:39:24 +00:00
Karl 'vollmerk' Vollmer
49c1cefcb9 few tweaks for flash player and a fixed for downsampleing 2006-10-30 07:18:46 +00:00
Karl 'vollmerk' Vollmer
598a200b96 ok this is ugly but it works 2006-10-30 04:46:45 +00:00
Karl 'vollmerk' Vollmer
c63317e869 some initial flash player integration from forums and some bug fixes on most popular 2006-10-29 19:16:56 +00:00
xgizzmo
2b62d84743 Added new pages to ui.lib,Fixed typo in show_playlist,Some XHTML fix ups 2006-06-23 01:00:36 +00:00
Karl 'vollmerk' Vollmer
e3734f063e moved init.php improved vainfo a bit, removed checkboxes from search page 2006-06-17 16:32:04 +00:00
Karl 'vollmerk' Vollmer
2b55e30467 This update includes a full rewrite of the Localplay code, only update
to this version if you don't care about losing a lot of functionality
while I am still finishing it up. Also the only working localplay
method is currently MPD. UPDATE AT YOUR OWN RISK!
2006-04-08 05:58:05 +00:00
Karl 'vollmerk' Vollmer
05e6d947be fixed a problem I introduced by unfudging the song.php file 2006-04-02 08:14:21 +00:00
Karl 'vollmerk' Vollmer
2f126626cb added download for size, and seriously cleaned up the /song.php file it actually is not ugly anymore.. yeah! 2006-03-31 08:07:54 +00:00
Karl 'vollmerk' Vollmer
976277f637 fixed playlist track ordering mojo 2006-01-22 03:36:35 +00:00
Karl 'vollmerk' Vollmer
d76cefcf01 fixed disabled songs mojo 2006-01-16 02:59:34 +00:00
Karl 'vollmerk' Vollmer
fdb23e3779 fixed play selected always playing everything on a playlist regardless 2006-01-14 19:16:00 +00:00
Karl 'vollmerk' Vollmer
e25a9d5480 I swear the last db upgrade of this release... at least it better be or I will have to beat myself up 2006-01-05 15:43:44 +00:00
Karl 'vollmerk' Vollmer
4e9823cd10 fixed mysql5 crap, thx WarrenG cleaned up some of the show_songs code and stuff that calls it, did a little work on playlists 2006-01-04 08:11:01 +00:00
Karl 'vollmerk' Vollmer
dfbe65e1bf whole new playlists files new coolness supported but not implmented, playback works but playlist edit functions are still untested... 2006-01-03 09:21:29 +00:00
xgizzmo
7ea54a5c71 Removed some debug code to fix random play. 2005-12-26 20:45:20 +00:00
Karl 'vollmerk' Vollmer
27158141ee initial ratings mojo, some stylesheet fixes, changed user preferences again and a db update 2005-12-25 10:04:27 +00:00