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
ca2028256a
Add timeline / friends timeline (= user activities)
2015-11-04 23:59:13 +01:00
Afterster
24918b6cd0
Merge branch 'develop' of https://github.com/nioc/ampache into nioc-develop
2015-09-19 17:34:11 +02: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
nioc
ab292f7de7
Upgrade scrobbling API (last.fm and libre.fm)
...
Upgrade the scrobbler class, Lastfm and Librefm plugins to use the new API.
Authentication is changed:
-admin needs to create a last.fm API account, set their API key and secret in the ampache.cfg file,
-users need to grant Ampache application to last.fm / Libre.fm services by using preference tab > plugins.
Resolves ampache/ampache#922
Add the "spread the love" function to share your favorites on Last.fm and Libre.fm.
Change-Id: Ia81334f4f4506258a27d40b6c257a1e38bd69097
Signed-off-by: nioc <nioc@users.noreply.github.com>
2015-08-23 03:38:56 +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
45d7ed9226
Fix catalog favorites plugin access rights filter
2015-04-18 21:23:05 +02:00
Afterster
b04208b5c3
Add methods to retrieve library item description and art with fallback to parent data
2015-04-05 10:21:43 +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
Lawrence Brown
60a653daf4
copyright 2014 -> 2015
...
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
7258fdcb63
Add video image preview
2014-07-08 09:05:45 +02:00
Afterster
786c234d5f
Add tvshows / movies first objects
2014-07-05 10:25:12 +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
5489e6d7a2
"Flag" replaced by "Favorite" Fix #155
...
Fix right playlist over content when localplay is enabled
2014-05-05 20:30:14 +02: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
b6a7ba792f
Catalog disable filter on stats and search too ( fix #33 )
2013-12-14 11:24:19 +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
1745e204cd
Fix code style
2013-11-23 01:11:19 +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
Afterster
5c618a9696
Add user flags on songs, albums, artists
...
Bug fix rating on stats page (object id conflict)
Bug fix cell alignment when rating disabled
2013-11-10 12:07:30 +01:00
