yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 19:41:55 +02:00
Code Issues Releases Wiki Activity
4709 commits 4 branches 18 tags 116 MiB
Commit graph

750 commits

Author SHA1 Message Date
Afterster
cd20b85c86 Remove AmpacheApi from git base 2015-11-15 20:34:44 +01:00
Afterster
ad09385887 Fix build 2015-11-07 09:35:33 +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
René Bigler
04d8ce9c11 [BUGFIX] Fixe some code style issues 2015-10-29 23:09:52 +01:00
René Bigler
4a52b1e3c4 [BUGFIX] Fix PHP 5.4 incompatibility 2015-10-29 22:09:59 +01:00
René Bigler
5f50341dff Merge branch 'develop' into feature/customMetadata 2015-10-29 20:36:49 +01:00
wagnered
6815977ca7 Added trim of leading 0's for season and episode numbers to satisfy Tvdb URL 2015-10-19 10:59:08 -07:00
Afterster
bda9389c26 Add rating on XML API 2015-10-16 22:47:01 +02:00
Afterster
32c6e77806 Fix XBMC localplay mistype 2015-10-16 22:00:27 +02:00
Afterster
468b5fba5c Merge branch 'wagnered-develop' into develop 2015-10-13 22:12:22 +02:00
Afterster
7fc69cb05f Fix deprecated constructor declarations 2015-10-05 20:40:41 +02:00
Afterster
9be94cc5ca Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 
Conflicts:
	config/ampache.cfg.php.dist
	modules/plugins/Tmdb/Tmdb.plugin.php
	modules/plugins/Tvdb/Tvdb.plugin.php
 2015-09-23 22:24:48 +02:00
Afterster
b336d1ab7e Merge branch 'nioc-develop' into develop 
Conflicts:
	modules/plugins/Lastfm/Lastfm.plugin.php
	modules/plugins/Librefm/Librefm.plugin.php
 2015-09-22 20:21:50 +02:00
Afterster
db131af442 Create a folder per plugin 
Always detect Composer system dependencies to not break installation because of optional modules
 2015-09-19 23:40:58 +02:00
Afterster
24918b6cd0 Merge branch 'develop' of https://github.com/nioc/ampache into nioc-develop 2015-09-19 17:34:11 +02:00
Afterster
f2e69a198f Fix Wanted feature with latest MusicBrainz library release 2015-09-16 22:55:02 +02:00
Afterster
5094e2e1a1 Fix MusicBrainz Request http adapter use 2015-09-16 22:12:02 +02:00
Afterster
16d80f8435 Use Composer for dependencies 2015-09-13 23:30:20 +02:00
wagnered
df8fb22f54 Refined Vainfo->_parse_filename($filename) to better parse movie and tv show file names. 
Removed Vainfo::parseFilename($filename).
 2015-09-12 15:58:14 -07:00
René Bigler
ff1b1d0b04 [FIX] Fix some code style issues 2015-09-09 23:34:03 +02:00
René Bigler
cc0db3aadc [FEATURE] Create possibility to disable metadata fields 2015-09-09 23:26:30 +02:00
René Bigler
d68886bf8d [FEATURE] Add config to disable custom metadata 2015-09-08 22:07:05 +02:00
René Bigler
899e12e9c7 Merge branch 'develop' into feature/customMetadata 2015-09-07 21:24:56 +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
Afterster
5671081201 Remove Subsonic catalog client creation duplicates 2015-09-03 23:51:23 +02:00
Afterster
582bbbb188 Implements bin/write_playlists.inc tool to export playlists/artists/albums to playlist files (x2) 2015-09-03 23:47:20 +02:00
wagnered
ded0fed1bc Modified Tvdb and Tmdb plugins to correctly parse filenames. 2015-09-02 21:12:53 -07: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
nioc
1b1549e2c1 Fix code Formatting with php-cs-fixer (indentation and braces) 
Change-Id: Ia868dceed4dd087edfe4dd948952dbd69ed4fd4e
Signed-off-by: nioc <nioc@users.noreply.github.com>
 2015-08-09 20:25:38 +02:00
nioc
0c72fe4a04 Add rating based on POPM id3 tag 
Add function to set song rating based on POPM id3 tag when create or
update catalog (resolve ampache/ampache#919)
If no Ampache user mail matches with the one in POPM mail, use super
user rating (id = -1)

Change-Id: I83b94153655ab21d8dede3cade4fb260459df3c3
Signed-off-by: nioc <nioc@users.noreply.github.com>
 2015-08-09 18:27:54 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Afterster
d05a07e332 Update PHPMailer dependency to version 5.2.10 2015-06-11 21:06:08 +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
050e38ddb1 Update CHANGELOG.md 
Avoid OAuthException error in logs
Fix WebDAV backend using appropriate base uri and exceptions
 2015-05-31 12:06:00 +02:00
Afterster
26b30a2817 Add Podcast links to albums and artists if RSS Feed enabled 2015-05-02 10:00:13 +02:00
Afterster
5b3db76d61 Manual track link on Piwik to support track with Ajax page loading 2015-05-01 19:25:53 +02:00
Afterster
2b100a73cf Add Piwik and Google Analytics statistic modules 
Hide user agent from recently played if not at least a content manager user
 2015-05-01 18:25:58 +02:00
Afterster
bee714524d Update .htaccess deny access declaration to work with Apache 2.4 2015-05-01 16:30:58 +02:00
Afterster
e58d16fdbd Fix huge performance issues when the user and user_preference tables are large 2015-05-01 14:33:01 +02:00
Afterster
3c389a5842 Better donation plugin position 
Re-enable wait between multiple channel chunks
 2015-05-01 10:49:57 +02:00
Afterster
2837c44fe8 Add new display_user_field plugin type ; Paypal and Flattr user donation plugin 2015-05-01 07:39:08 +02:00
Afterster
b5fa56922f Fix captcha 2015-04-27 23:41:45 +02:00
Afterster
4c67bbdabc Add WebDAV backend 2015-04-19 13:19:47 +02:00
Afterster
3879db6fa5 Improve user upload permissions check 2015-04-12 09:48:10 +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
Afterster
d56f328005 Fix code style 2015-04-01 20:11:00 +02:00
Afterster
e244c1669b Merge branch 'develop' of https://github.com/SeregaPru/ampache into SeregaPru-develop 2015-04-01 19:55:40 +02:00
SeregaPru
7463e75204 UPnP localplay implementation 2015-03-25 23:42:34 +04:00