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

48 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
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
87edecfd64 Fixed #670: Localplay klick on volume makes playlist entries disappear 2015-01-12 23:15:03 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00: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
7a337edcad Fix #115, Fix #111, Fix #125 2014-01-29 18:40:20 +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
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
42133f38d2 Move access_denied() from lib/ui.lib.php to UI 2013-01-26 00:57:40 -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
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
Paul 'flowerysong' Arthur
7f36693353 Change Browse from static to instantiable. Among other things, fixes FS#13;
probably also breaks things.  Most things appear to still work, but I may have
missed some cases.
2010-06-10 05:33:57 +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
50036b1fad fix some browsing issues I created with the query switch, considering having browse class extend query 2009-03-09 15:32:18 +00:00
Karl 'vollmerk' Vollmer
0a2b41b143 fixed localplay not showing current playing song and clear playlist not refreshing the screen 2009-02-02 02:01:23 +00:00
Karl 'vollmerk' Vollmer
0dbace41fe added paging to the localplay playlist, fixed some preferences issues I introduced with the form register and caching 2008-08-05 01:46:01 +00:00
Karl 'vollmerk' Vollmer
2f5c09b55c updated locales, hopefully one of the last commits before 3.4 stable release 2008-05-10 09:27:42 +00:00
Karl 'vollmerk' Vollmer
2c337852cf major corrections to reading of preferences and a few misc fixes which I have now forgotten 2008-02-29 06:14:46 +00:00
Karl 'vollmerk' Vollmer
427c5ac163 fixed the filter display and added a playlist_type filter for admins 2008-01-14 05:03:03 +00:00
Karl 'vollmerk' Vollmer
850edbb1f2 first vestiages of edit localplay instance and test localplay instance support 2007-12-31 08:38:12 +00:00
Karl 'vollmerk' Vollmer
17a4516e29 added the controls to the mpd playlist does not refresh correctly, but does work 2007-12-09 20:58:04 +00:00
Karl 'vollmerk' Vollmer
f64a2f4d00 fixed admin prefs, flushed out localplay stuff, tweaked filters on browse 2007-10-18 05:52:06 +00:00
Karl 'vollmerk' Vollmer
ba62ca14b9 added abilty to display and delete localplay instances 2007-10-12 04:55:20 +00:00
Karl 'vollmerk' Vollmer
13852c51ea stupid mistake that broke all streaming 2007-09-28 15:33:59 +00:00
Karl 'vollmerk' Vollmer
d1dcfcbc90 some fixes for the localplay, you can now install the MPD controller, and add instances, just not actually play to it... realized I need to think on how to do that a little... 2007-09-14 07:04:26 +00:00
Karl 'vollmerk' Vollmer
bff9e37fa5 more work on the localplay stuff, most details ironed out, just needs some code to back it up, also tweaked plugins and threw in some extra goodies in the preference class, also pimped out the error class 2007-09-12 07:30:55 +00:00
pb1dft
67a4624f89 Rewrote the Dutch Translation Files and some otherminor typos 2006-11-18 01:35:06 +00:00
Karl 'vollmerk' Vollmer
ad6644d6cb fixed some localplay issues 2006-11-15 09:28:23 +00:00
Karl 'vollmerk' Vollmer
1cf69f04be some minor MPD changes and bug fixes for localplay 2006-11-14 05:38:17 +00:00
Karl 'vollmerk' Vollmer
ebdb7573bf fixed up localplay a little more, to the point of it basicly working... added check for mysql on installer langue page, tweaked some css as well 2006-09-28 05:39:50 +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
a02b8ce207 fixed clean, added lang to installer (thx ros) and cleaned up catalog display a bit and mojoed lang list 2006-05-01 07:22:07 +00:00
Karl 'vollmerk' Vollmer
5aeac3b17e added an ugly localplay view page, and made it so you can remove songs from your mpd playlist... its ugly.. I know.. ooh yea you can also deactivate modules now 2006-04-09 07:55:50 +00:00
Karl 'vollmerk' Vollmer
7b1e57d0cc fixed playlist add problem and a few other minor bugs 2006-04-09 04:28:56 +00:00
Karl 'vollmerk' Vollmer
83f3c41141 updated registration mojo thx pb1dft also some fluf updates 2006-01-02 01:06:06 +00:00
Karl 'vollmerk' Vollmer
975bbcebe9 new interface which breaks all previous themes... and current themes, still under development 2005-12-21 08:03:20 +00:00
Karl 'vollmerk' Vollmer
bcad40a05a New Import 2005-06-09 16:34:40 +00:00