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

4372 commits

Author SHA1 Message Date
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
336c88a127 Merge branch 'Niols-develop' into develop 2015-09-06 11:24:40 +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
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
Afterster
14dcce0cce Implements bin/write_playlists.inc tool to export playlists/artists/albums to playlist files 2015-09-03 23:44:29 +02:00
Afterster
fe799698ee Fix artist creation from album artist edition 2015-09-02 13:40:20 +02:00
Afterster
540be5a40b Don't try to print non scalar values on debug page 2015-08-31 22:38:56 +02:00
Afterster
eb8a9d23b0 Merge branch 'anonymous2ch-develop' into develop 2015-08-27 11:05:30 +02:00
Afterster
10e14fc590 Merged mbstring.func_overload warning to one unique line 2015-08-27 11:05:05 +02:00
Afterster
a2bc26dbb9 Merge branch 'develop' of https://github.com/anonymous2ch/ampache into anonymous2ch-develop 2015-08-27 11:02:28 +02:00
Afterster
26e3327f34 Better handle getAlbumList error cases (#938 variant) 2015-08-27 10:04:25 +02:00
Afterster
6085da5819 Remove created user auto-login after installation (wrong session data are created at this time) 2015-08-27 09:42:50 +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
Anonymous
06aee641f3 CSS fixes & some added functionality for video player 2015-08-15 15:31:21 +03: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
SUTJael
f9bcab575f Merge pull request #926 from hypfvieh/develop
Fixed missing space in get_icon method when using sprites
2015-08-15 14:22:27 +02:00
SUTJael
67e2f78e2f Merge pull request #928 from arnaudbey/missingSpace
Add missing separator between track & album in localplay playlist
2015-08-15 14:21:59 +02:00
arnaudbey
d405e55400 Add missing space between track & album in localplay playlist 2015-08-15 09:55:26 +00:00
Anonymous
a5662ed8cc check mbstring.func_overload, so you don't end up with a thousand corrupt files like me :) 2015-08-14 21:45:00 +03: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
343d9d7beb Revert changes to ampache.sql file as updates to database are handled automatically through update.class.php 2015-08-11 13:13:07 -06: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
SUTJael
df89cb845d Merge pull request #913 from Psy-Virus/develop
Fix: Translation does not change to Portuguese
2015-08-11 14:14:23 +02:00
SUTJael
f8a718cae0 Merge pull request #920 from nioc/develop
Add rating based on POPM id3 tag
2015-08-11 12:28: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
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
Psy-Virus
93e027fe63 Fix: Translation does not change to Portuguese
Thx to ionixjunior on Transifex for the Report.
2015-07-31 14:25:14 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Afterster
356b8f1e43 Merge pull request #911 from Psy-Virus/develop
POT-File update for Transifex
2015-07-29 21:50:06 +02:00
Afterster
4cb25572c5 Fix tag name in song details of XML API 2015-07-29 21:48:29 +02:00
Psy-Virus
79e8ede1e3 POT-File update for Transifex
The rest should be done by Transifex automatically :-)

I've also updated the Translation-words.txt
2015-07-29 04:23:59 +02:00
Afterster
f946a1ce04 Fix catalog export (fix #899) 2015-07-10 22:44:22 +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
Afterster
53caa3d94a Add metadata on xml api songs result
Fix "Next" button when browsing start offset is aligned to offset limit (fix #888)
2015-07-05 22:03:12 +02:00