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

2072 commits

Author SHA1 Message Date
Afterster
89d6e8aa6c Merge branch 'xml_advanced_search' of https://github.com/nicklan/ampache into nicklan-xml_advanced_search 2015-09-23 22:30:48 +02:00
Maniac
57e529e7de Fixed indenting (again -.-) 2015-09-23 10:54:29 +02:00
Maniac
68204bc413 Fixed issue that song/album/artistCount parameters were ignored if they were 0 2015-09-23 10:51:52 +02:00
Afterster
e85e21ce92 Fix statistics Graph broken since Composer move (fix #966) 2015-09-23 07:06:10 +02:00
Afterster
1446bd22c6 Create UPnP UUID from host
Avoid plugin debug message for current and parent directory test
2015-09-22 22:02:29 +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
2f00d06a98 Fix installation header css
Use --prefer-source --no-interaction on composer install
Update MusicBrainz, Tmdb and SabreDAV dependencies
2015-09-17 23:50:41 +02:00
Afterster
8d327d1b74 Fix Wanted deletion 2015-09-16 23:44:14 +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
bb0f9d5916 Update getid3, noty and phpmailer dependencies to latest release 2015-09-14 23:13:15 +02:00
Afterster
299cc0aa9e Fix tag map on library items 2015-09-14 22:54:00 +02:00
Afterster
16d80f8435 Use Composer for dependencies 2015-09-13 23:30:20 +02:00
Afterster
fa8084d312 Update SQL default script with latest sql updates 2015-09-11 23:09:49 +02:00
Afterster
7fa6e5c31a Fix catalog actions without Ajax (fix #947) 2015-09-11 22:14:02 +02:00
Byron Marohn
486b9b0473 Fix capitalization of SQL call to match existing style
Signed-off-by: Byron Marohn <combustible@live.com>
2015-09-10 09:36:14 -07:00
Byron Marohn
f466e83c9b Make unrated songs appear as 0 rating
This makes it possible to search for rating < 1 to build a smart
playlist of unrated songs. Fixes #819.

Signed-off-by: Byron Marohn <combustible@live.com>
2015-09-10 09:16:57 -07:00
Nick Lanham
598ec3b870 Add advanced_search api call 2015-09-09 20:38:52 +00:00
Nick Lanham
6bd0c80b1d Speed up (a lot) subsonic getArtists method
- Make Catalog::get_artists return an album count as "albums".
- Pass through to subsonic api calls to avoid running query for every
artist to count albums (as was happening previously)
2015-09-08 18:40:51 +00:00
Afterster
42d4b209e7 Use theme base css and colors from theme configuration (fix #934) 2015-09-06 13:42:20 +02:00
Afterster
2424c76ab7 Fixing Boolean comparison operators 2015-09-06 11:30:49 +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
8a1ea90ed4 Add m3u8 playlist import
Use audioscrobbler API v2 for album search
2015-09-06 10:08:36 +02:00
Afterster
4d3949cf5a Trim featuring from artists 2015-09-05 21:11:25 +02:00
Afterster
8f1ede91c4 Handle id3v2 utf-8 comment 2015-09-05 11:07:00 +02:00
Afterster
73879d089c Fix stream playlist wrong object use 2015-09-04 07:25:47 +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
Afterster
fe799698ee Fix artist creation from album artist edition 2015-09-02 13:40:20 +02:00
Afterster
26e3327f34 Better handle getAlbumList error cases (#938 variant) 2015-08-27 10:04:25 +02:00
Afterster
afac314ad1 Fix iTunes 12 browsing
Add bin/daap_register.bat script
2015-08-26 18:34:33 +02:00
Afterster
2f5ef59e8c Fix http_port at installation process 2015-08-26 13:26:56 +02:00
Afterster
89e3a84397 Move http_port user preference to ampache.cfg.php (fix #937) 2015-08-26 12:09:32 +02:00
Afterster
2307100a6c Merge pull request #929 from hypfvieh/hypfvieh-patch
Patch for wrong file size in database
2015-08-25 23:20:14 +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
Maniac
d5562a0f55 Fixed broken indenting 2015-08-17 07:10:17 +02:00
SUTJael
d3d01830e2 Merge pull request #917 from Fondor1/develop
Added functionality for streaming playlists to support track numbers
2015-08-15 14:25:10 +02:00
Maniac
7a997f477b Removed unused assignment 2015-08-13 12:34:56 +02:00
Maniac
8b1f61f7dd Fixed issue with wrong file size written to catalog when using id3v2, which sometimes
contains a wrong size (in comparsion with the real file size)
2015-08-13 11:42:50 +02:00
Maniac
cfe1b1371e Fixed missing space in get_icon method when using sprites 2015-08-13 08:51:03 +02:00
Fondor1
8806ce0b00 Corrected copy-paste oversight in a comment 2015-08-11 12:02:19 -06:00
Fondor1
8bb585c9fc Make changes to sql update script per comment from SUTJael 2015-08-11 10:34:05 -06: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
unknown
c060cc1746 Added functionality for streaming playlists to support track numbers:
* new column 'track_num' added to table stream_playlist
* added new item 'track_num' to properties array within Stream_URL
* added track number for xspf playlist format
2015-08-05 17:07:37 -06:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Afterster
4cb25572c5 Fix tag name in song details of XML API 2015-07-29 21:48:29 +02:00
Afterster
9f51e5e388 Better metadata change log in Song::compare_song_information method 2015-07-08 07:02:26 +02:00
Afterster
8b4abc2960 Fix file change detection if show_played_times setting is enabled 2015-07-05 22:20:18 +02:00