1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Commit graph

64 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
Afterster
c033d03f0b Add songs list display to labels 2015-04-21 07:37:28 +02:00
Afterster
0a1b46f437 Add Label entity 2015-04-21 00:05:41 +02:00
Afterster
81ff034bd1 Remove shoutbox spool for notification
Move shoutbox homepage code to a home plugin
Add catalog favorites home plugin
2015-04-05 00:11:12 +02:00
Psy-Virus
6ec666e41b Ger & Fr translation + translation catalog updated
+ changed the translation string in server/index.ajax.php for better
compatibility with, for example: PoEdit.
+ Grammar correction in templates/show_install_config.inc.php.
2015-02-06 14:51:21 +01:00
Afterster
a80bc4b6f9 Add Installation Type and Players helper sections at installation process
Add 'no catalog' message helper
2015-01-31 12:29:31 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
3e0c45d12e Restore browse_filter on ajax page loading (fix #505) 2014-10-25 10:00:14 +02:00
Afterster
bcdd4cc9ef Don't force to have an image on "Albums of the moment" 2014-08-05 08:09:01 +02:00
Afterster
80cd08ed04 Fix Scrutinizer reported errors 2014-07-09 23:27:14 +02:00
Afterster
0254be9982 Better Video integration in Ampache features 2014-07-08 20:00:33 +02:00
SUTJael
470ec264cd Add collapsible left menu (Fix #216) 2014-06-12 16:53:46 +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
Afterster
3f9e7a4d94 Fix channel with random songs according to #176 2014-05-13 23:17:22 +02:00
Afterster
99c975726c Fix album art on xspf playlist stream and add concerts settings 2014-03-16 00:51:01 +01:00
Afterster
833ff0c120 Update Acknowledgements with old contributors 2014-02-25 07:18:57 +01:00
Afterster
36d9c319bc Waveform notification at specific song time 2014-02-21 01:36:32 +01:00
SUTJael
cb8c1e3e4a Center slideshow.
Should be improved for none "stretching" effect.
2014-02-17 18:10:05 +01:00
Afterster
aad0879be7 Fox slideshow when changing song 2014-02-14 02:14:23 +01:00
Afterster
7cfed01b1e Add artist slideshow when playing and no user action 2014-02-14 01:28:29 +01:00
Afterster
e0a1443566 Add UI for Channels 2014-02-03 07:24:13 +01:00
Afterster
4ee4001c6b Change similar artists number display to 10 2014-01-31 07:53:12 +01:00
Afterster
99bf701a60 Display missing artists in similar artists if Wanted feature enabled 2014-01-31 07:42:34 +01:00
Afterster
0296d01ca1 Fix concerts list 2014-01-30 13:41:14 +01:00
Afterster
2d78a3b7a8 Add concerts information from LastFM (fix #110) 2014-01-30 00:09:58 +01:00
Afterster
0a099f2383 Start show missing artists 2014-01-16 09:16:24 +01:00
Afterster
2854263847 Adjust some shoutbox default settings 2014-01-05 01:43:39 +01:00
Afterster
1fadaed749 Add Shoutbox link on album page and change a bit now playing display 2014-01-05 01:20:52 +01:00
Afterster
e63c5aa007 Fix travis build 2014-01-05 01:08:15 +01:00
Afterster
c352d65597 Add shoutbox notifications and improve Shoutbox css 2014-01-05 00:38:27 +01:00
Afterster
4153040efe Add global search auto-completion (fix #88) 2014-01-03 19:59:33 +01:00
Afterster
9aa505e320 Fix plugins and add new Process Wanted plugin type 2013-12-26 22:35:02 +01:00
Afterster
08cdf73349 Merge branch 'master' of github.com:ampache-doped/ampache
Conflicts:
	lib/class/update.class.php
2013-12-26 22:17:13 +01:00
Afterster
be947f9218 Add Wanted List feature 2013-12-26 22:13:44 +01:00
SUTJael
ed94a9b6bf Similar artists/songs displayed on two groups (Fix #82) 2013-12-26 13:02:54 +01:00
SUTJael
58332b5cb6 Starting locales (languages) update
Fix similar artist async refresh
Update icons
Hide sortable column when not required
2013-12-13 11:54:05 +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
SUTJael
18fe2addc2 LastFM requests are now asynchronous (Fix #64) 2013-12-12 17:41:57 +01:00
SUTJael
14b1f87e67 Fix many colspan issues 2013-12-11 16:01:08 +01:00
Afterster
619ca48ffe Add paging to information pages (fix #8) 2013-11-23 01:06:58 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Paul Arthur
c952ca6fa3 Be smarter about getting random albums with art
Just ask the database for what we want instead of asking for more
results, sifting through them, and hoping that we get enough
qualifying results to fulfill the request.

Also drop Random::album(), since it's duplicate code and it makes more
sense for this to live in Album.
2013-07-22 16:54:47 -04:00