yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 01:39:28 +02:00
Code Issues Releases Wiki Activity
4769 commits 4 branches 18 tags 116 MiB
Commit graph

59 commits

Author SHA1 Message Date
Phyks (Lucas Verney)
e86ea9a099 Fix copyright date 2016-08-01 22:02:00 +02:00
Phyks (Lucas Verney)
2bb142eeb8 Fix issue #1260 
Fix coding guidelines incoherences. Code should match PSR1/2 now, and
php-cs is set to check it on each commit.

Also fixed the Git hook to take into account only added, modified,
copied and renamed files (preventing errors when trying to check deleted
files).

Closes #1260.
 2016-08-01 21:55:14 +02:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
Afterster
a340c30872 Update code style script with new checks 2015-11-18 22:39:49 +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
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
Afterster
49cd42562b Replace iframe with Ajax page loading :) :) 2014-08-08 01:36:07 +02:00
Afterster
daa8b3133b Add video subtitle support 
Add local_web_path setting (fix #324)
 2014-07-16 22:41:19 +02:00
Afterster
afa536c6be Fix code style 2014-07-08 20:24:51 +02:00
Afterster
0254be9982 Better Video integration in Ampache features 2014-07-08 20:00:33 +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
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
598464f114 Add some logs to transcode settings 2014-04-18 20:04:45 +02:00
SUTJael
7d22e8d466 Implementation for #136 started. Album is now ready to be grouped by disks. 
Need to create the new view in the album details. Group only works for album with musicbrainz identifiers.
 2014-03-20 21:23:34 +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
52e1a7082a Fix iframe basket play action reload 2014-01-06 07:27:04 +01:00
Afterster
4153040efe Add global search auto-completion (fix #88) 2014-01-03 19:59:33 +01:00
Afterster
42f4ba3fa9 Fix iframe play action reload 2013-12-30 09:42:49 +01:00
Afterster
26b0320c4a Add song previews on missing albums, EchoNest API support 2013-12-28 16:40:35 +01:00
Afterster
f413ec6f12 First Video player implementation with jPlayer 2013-12-14 01:15:32 +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
19dd53127e Option to add items to the currently played web player playlist (fix #71) 2013-12-13 00:30:30 +01:00
SUTJael
aca49c658d Completely replaced the inline edition by dialog edition. 
Add autocomplete for tags.
Directplay added on Radio and Smart Playlists.
Many code style fixed.
Removed all defined size (need to do that into CSS if needed).
Fixed other bugs found around..
 2013-11-24 22:01:21 +01:00
Afterster
e35f175a4b Rename HTML5 Player to Web Player 2013-11-23 13:50:29 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
SUTJael
12303fee13 New feature: Play/Play all to play artist/album/song directly. This does not impact existing playlist. Optional. New feature: Dialog confirmation on "Reset from tags", "Reset Album Art" and "Delete" (on playlist) Enhancement: Change "Not Enough Data" message to something personalized for each components. Enhancement: Make playlist action's text clickable. 
Need to update languages and regenerate .mo files.
 2013-11-10 12:07:43 +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
Paul Arthur
1a164ba699 Yank out the Flash player by the roots. 2013-01-28 13:26:11 -05:00
Holger Brunn
959aebe07f Add an HTML5 player 
Merge request #20.  Basic, not very pretty, but works and, unlike the
Flash player, is maintainable.
 2013-01-28 13:26:11 -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
136f9f5856 Move ajax_include() from ui.lib.php to UI 2013-01-26 01:35:59 -05:00
Paul Arthur
d87c539500 Cosmetics: clean up heads in server/ 2013-01-25 19:05:28 -05:00
Paul Arthur
34b0eaf233 Clean up uses of Config::set and Config::set_by_array 
Consistently pass in a boolean instead of a string or an int for the
clobber flag.
 2012-03-06 12:18:57 -05: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
f99643663c header comment modified for phpdoc 2011-02-03 09:43:46 +09:00
Paul 'flowerysong' Arthur
6277492321 JavaScript cleanup. Consistently use camelCase for naming JS functions. Use 
Prototype functionality where possible (particularly for Ajax).  Move our JS
into lib/javascript (I dropped kajax as an external module since the new
ajax.js is completely different apart from function headers.)  Remove unused
JS functions from base.js.
 2010-06-24 02:52:01 +00:00
Paul 'flowerysong' Arthur
4b5756ba9d Miscellaneous cleanup. 2010-06-13 08:11:09 +00:00
Paul 'flowerysong' Arthur
1cb0983ed0 Cosmetics: remove trailing whitespace 2010-03-14 20:14:52 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
Karl 'vollmerk' Vollmer
b2b41d6c4a put in a hack to clear the rightbar if the preferences deem it so 2008-12-28 22:12:10 +00:00
Karl 'vollmerk' Vollmer
2878f7eebd fixed lack of refresh when switching between localplay and other play methods 2008-05-08 15:32:01 +00:00