← Back to branch summary

~cjsmo/ampache/ampache

~cjsmo/ampache/ampache

Viewing all changes in revision 3953.

Committer: Afterster
Date: 2015-11-07 07:09:23 UTC
mfrom: (3952.1.1)
Revision ID: git-v1:88b4662919026b030698448b7cdf6c8dc0cb9897

Merge branch 'Psy-Virus-develop' into develop

files modified:
admin/access.php

admin/catalog.php

admin/duplicates.php

admin/index.php

admin/license.php

admin/mail.php

admin/modules.php

admin/shout.php

admin/system.php

admin/users.php

albums.php

artists.php

arts.php

batch.php

broadcast.php

browse.php

channel.php

channel/index.php

daap/index.php

democratic.php

graph.php

image.php

index.php

install.php

labels.php

lib/batch.lib.php

lib/class/access.class.php

lib/class/ajax.class.php

lib/class/album.class.php

lib/class/ampache_rss.class.php

lib/class/api.class.php

lib/class/art.class.php

lib/class/artist.class.php

lib/class/auth.class.php

lib/class/autoupdate.class.php

lib/class/broadcast.class.php

lib/class/broadcast_server.class.php

lib/class/browse.class.php

lib/class/catalog.class.php

lib/class/channel.class.php

lib/class/core.class.php

lib/class/daap_api.class.php

lib/class/database_object.abstract.php

lib/class/dba.class.php

lib/class/democratic.class.php

lib/class/error.class.php

lib/class/graph.class.php

lib/class/label.class.php

lib/class/license.class.php

lib/class/live_stream.class.php

lib/class/localplay.class.php

lib/class/localplay_controller.abstract.php

lib/class/mailer.class.php

lib/class/movie.class.php

lib/class/openid.class.php

lib/class/personal_video.class.php

lib/class/playlist.class.php

lib/class/playlist_object.abstract.php

lib/class/plex_api.class.php

lib/class/plex_xml_data.class.php

lib/class/plugin.class.php

lib/class/preference.class.php

lib/class/privatemsg.class.php

lib/class/query.class.php

lib/class/random.class.php

lib/class/rating.class.php

lib/class/recommendation.class.php

lib/class/registration.class.php

lib/class/scrobbler.class.php

lib/class/scrobbler_async.class.php

lib/class/search.class.php

lib/class/session.class.php

lib/class/share.class.php

lib/class/shoutbox.class.php

lib/class/slideshow.class.php

lib/class/song.class.php

lib/class/song_preview.class.php

lib/class/stats.class.php

lib/class/stream.class.php

lib/class/stream_playlist.class.php

lib/class/stream_url.class.php

lib/class/subsonic_api.class.php

lib/class/subsonic_xml_data.class.php

lib/class/tag.class.php

lib/class/tmp_playlist.class.php

lib/class/tvshow.class.php

lib/class/tvshow_episode.class.php

lib/class/tvshow_season.class.php

lib/class/ui.class.php

lib/class/update.class.php

lib/class/upload.class.php

lib/class/upnp_api.class.php

lib/class/user.class.php

lib/class/useractivity.class.php

lib/class/userflag.class.php

lib/class/vainfo.class.php

lib/class/video.class.php

lib/class/wanted.class.php

lib/class/waveform.class.php

lib/class/webdav_catalog.class.php

lib/class/webdav_directory.class.php

lib/class/webplayer.class.php

lib/class/xml_data.class.php

lib/debug.lib.php

lib/general.lib.php

lib/i18n.php

lib/init-tiny.php

lib/init.php

lib/install.lib.php

lib/log.lib.php

lib/login.php

lib/preferences.php

lib/themes.php

lib/ui.lib.php

localplay.php

lostpassword.php

modules/catalog/beets/beets.catalog.php

modules/catalog/beetsremote/beetsremote.catalog.php

modules/catalog/dropbox/dropbox.catalog.php

modules/catalog/local/local.catalog.php

modules/catalog/remote/AmpacheApi.lib.php

modules/catalog/remote/remote.catalog.php

modules/catalog/soundcloud/soundcloud.catalog.php

modules/catalog/subsonic/subsonic.catalog.php

modules/catalog/subsonic/subsonic.client.php

modules/localplay/httpq/httpq.controller.php

modules/localplay/httpq/httpqplayer.class.php

modules/localplay/mpd/mpd.class.php

modules/localplay/mpd/mpd.controller.php

modules/localplay/upnp/upnp.controller.php

modules/localplay/upnp/upnpdevice.php

modules/localplay/upnp/upnpplayer.class.php

modules/localplay/upnp/upnpplaylist.php

modules/localplay/vlc/vlc.controller.php

modules/localplay/vlc/vlcplayer.class.php

modules/localplay/xbmc/xbmc.controller.php

modules/plugins/7Digital/7Digital.plugin.php

modules/plugins/Amazon/Amazon.plugin.php

modules/plugins/Bitly/Bitly.plugin.php

modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php

modules/plugins/ChartLyrics/ChartLyrics.plugin.php

modules/plugins/Flickr/Flickr.plugin.php

modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php

modules/plugins/GoogleMaps/GoogleMaps.plugin.php

modules/plugins/Growl/Growl.plugin.php

modules/plugins/Headphones/Headphones.plugin.php

modules/plugins/Lastfm/Lastfm.plugin.php

modules/plugins/Librefm/Librefm.plugin.php

modules/plugins/LyricWiki/LyricWiki.plugin.php

modules/plugins/MusicBrainz/MusicBrainz.plugin.php

modules/plugins/Omdb/Omdb.plugin.php

modules/plugins/Piwik/Piwik.plugin.php

modules/plugins/RSSView/RSSView.plugin.php

modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php

modules/plugins/StreamHits/StreamHits.plugin.php

modules/plugins/StreamTime/StreamTime.plugin.php

modules/plugins/TheAudioDb/TheAudioDb.plugin.php

modules/plugins/Tmdb/Tmdb.plugin.php

modules/plugins/Tvdb/Tvdb.plugin.php

modules/plugins/Yourls/Yourls.plugin.php

play/index.php

playlist.php

plex/index.php

plex/web/index.php

preferences.php

pvmsg.php

radio.php

register.php

rest/index.php

rss.php

scripts/tests/codestyle.sh

server/ajax.server.php

server/browse.ajax.php

server/catalog.ajax.php

server/democratic.ajax.php

server/edit.server.php

server/fs.ajax.php

server/index.ajax.php

server/localplay.ajax.php

server/player.ajax.php

server/playlist.ajax.php

server/random.ajax.php

server/refresh_reordered.server.php

server/search.ajax.php

server/song.ajax.php

server/stats.ajax.php

server/stream.ajax.php

server/tag.ajax.php

share.php

show_get.php

smartplaylist.php

song.php

stream.php

templates/browse_filters.inc.php

templates/footer.inc.php

templates/header.inc.php

templates/list_header.inc.php

templates/rightbar.inc.php

templates/show_account.inc.php

templates/show_add_catalog.inc.php

templates/show_add_upload.inc.php

templates/show_album.inc.php

templates/show_album_group_disks.inc.php

templates/show_album_row.inc.php

templates/show_albums.inc.php

templates/show_artist.inc.php

templates/show_artist_row.inc.php

templates/show_artists.inc.php

templates/show_arts.inc.php

templates/show_broadcast_row.inc.php

templates/show_broadcasts_dialog.inc.php

templates/show_catalog_row.inc.php

templates/show_catalog_types.inc.php

templates/show_channel_row.inc.php

templates/show_duplicates.inc.php

templates/show_edit_album_row.inc.php

templates/show_edit_artist_row.inc.php

templates/show_edit_playlist_row.inc.php

templates/show_edit_search_row.inc.php

templates/show_edit_share_row.inc.php

templates/show_edit_song_row.inc.php

templates/show_export.inc.php

templates/show_html5_player.inc.php

templates/show_install_lang.inc.php

templates/show_label.inc.php

templates/show_label_row.inc.php

templates/show_live_stream_row.inc.php

templates/show_localplay_controllers.inc.php

templates/show_localplay_status.inc.php

templates/show_login_form.inc.php

templates/show_lostpassword_form.inc.php

templates/show_lyrics.inc.php

templates/show_manage_catalogs.inc.php

templates/show_missing_album.inc.php

templates/show_missing_artist.inc.php

templates/show_now_playing.inc.php

templates/show_now_playing_row.inc.php

templates/show_now_playing_video_row.inc.php

templates/show_object_rating.inc.php

templates/show_object_row.inc.php

templates/show_object_userflag.inc.php

templates/show_partial_clip.inc.php

templates/show_partial_personal_video.inc.php

templates/show_partial_tvshow_episode.inc.php

templates/show_playlist_row.inc.php

templates/show_playlist_song_row.inc.php

templates/show_playlists_dialog.inc.php

templates/show_playtype_switch.inc.php

templates/show_plugins.inc.php

templates/show_popular.inc.php

templates/show_preference_admin.inc.php

templates/show_preference_box.inc.php

templates/show_pvmsg.inc.php

templates/show_pvmsg_row.inc.php

templates/show_random_albums.inc.php

templates/show_random_videos.inc.php

templates/show_recently_played.inc.php

templates/show_search_row.inc.php

templates/show_share.inc.php

templates/show_share_row.inc.php

templates/show_song.inc.php

templates/show_song_preview_row.inc.php

templates/show_song_row.inc.php

templates/show_songs.inc.php

templates/show_stats.inc.php

templates/show_stats_highest.inc.php

templates/show_stats_newest.inc.php

templates/show_stats_recent.inc.php

templates/show_stats_share.inc.php

templates/show_stats_upload.inc.php

templates/show_stats_userflag.inc.php

templates/show_stats_wanted.inc.php

templates/show_tagcloud.inc.php

templates/show_test_table.inc.php

templates/show_tvshow.inc.php

templates/show_tvshow_row.inc.php

templates/show_tvshow_season.inc.php

templates/show_tvshow_season_row.inc.php

templates/show_tvshow_seasons.inc.php

templates/show_tvshows.inc.php

templates/show_user.inc.php

templates/show_user_activate.inc.php

templates/show_user_registration.inc.php

templates/show_user_row.inc.php

templates/show_users.inc.php

templates/show_video.inc.php

templates/show_video_row.inc.php

templates/show_wanted_album_row.inc.php

templates/show_web_player.inc.php

templates/sidebar.inc.php

templates/sidebar_home.inc.php

templates/sidebar_localplay.inc.php

templates/stylesheets.inc.php

tvshow_seasons.php

tvshows.php

upload.php

upnp/control-reply.php

upnp/find.php

upnp/index.php

upnp/playstatus.php

video.php

waveform.php

webdav/index.php

Show diffs side-by-side

added added

removed removed

admin/access.php

admin/catalog.php

admin/duplicates.php

admin/index.php

admin/license.php

admin/modules.php

admin/shout.php

admin/system.php

admin/users.php

channel/index.php

lib/batch.lib.php

lib/class/access.class.php

lib/class/ajax.class.php

lib/class/album.class.php

lib/class/ampache_rss.class.php

lib/class/api.class.php

lib/class/art.class.php

lib/class/artist.class.php

lib/class/auth.class.php

lib/class/autoupdate.class.php

lib/class/broadcast.class.php

lib/class/broadcast_server.class.php

lib/class/browse.class.php

lib/class/catalog.class.php

lib/class/channel.class.php

lib/class/core.class.php

lib/class/daap_api.class.php

lib/class/database_object.abstract.php

lib/class/dba.class.php

lib/class/democratic.class.php

lib/class/error.class.php

lib/class/graph.class.php

lib/class/label.class.php

lib/class/license.class.php

lib/class/live_stream.class.php

lib/class/localplay.class.php

lib/class/localplay_controller.abstract.php

lib/class/mailer.class.php

lib/class/movie.class.php

lib/class/openid.class.php

lib/class/personal_video.class.php

lib/class/playlist.class.php

lib/class/playlist_object.abstract.php

lib/class/plex_api.class.php

lib/class/plex_xml_data.class.php

lib/class/plugin.class.php

lib/class/preference.class.php

lib/class/privatemsg.class.php

lib/class/query.class.php

lib/class/random.class.php

lib/class/rating.class.php

lib/class/recommendation.class.php

lib/class/registration.class.php

lib/class/scrobbler.class.php

lib/class/scrobbler_async.class.php

lib/class/search.class.php

lib/class/session.class.php

lib/class/shoutbox.class.php

lib/class/slideshow.class.php

lib/class/song.class.php

lib/class/song_preview.class.php

lib/class/stats.class.php

lib/class/stream.class.php

lib/class/stream_playlist.class.php

lib/class/stream_url.class.php

lib/class/subsonic_api.class.php

lib/class/subsonic_xml_data.class.php

lib/class/tag.class.php

lib/class/tmp_playlist.class.php

lib/class/tvshow.class.php

lib/class/tvshow_episode.class.php

lib/class/tvshow_season.class.php

lib/class/ui.class.php

lib/class/update.class.php

lib/class/upload.class.php

lib/class/upnp_api.class.php

lib/class/user.class.php

lib/class/useractivity.class.php

lib/class/userflag.class.php

lib/class/vainfo.class.php

lib/class/video.class.php

lib/class/wanted.class.php

lib/class/waveform.class.php

lib/class/webdav_catalog.class.php

lib/class/webdav_directory.class.php

lib/class/webplayer.class.php

lib/class/xml_data.class.php

lib/debug.lib.php

lib/general.lib.php

lib/init-tiny.php

lib/install.lib.php

lib/log.lib.php

lib/preferences.php

lostpassword.php

modules/catalog/beets/beets.catalog.php

modules/catalog/beetsremote/beetsremote.catalog.php

modules/catalog/dropbox/dropbox.catalog.php

modules/catalog/local/local.catalog.php

modules/catalog/remote/AmpacheApi.lib.php

modules/catalog/remote/remote.catalog.php

modules/catalog/soundcloud/soundcloud.catalog.php

modules/catalog/subsonic/subsonic.catalog.php

modules/catalog/subsonic/subsonic.client.php

modules/localplay/httpq/httpq.controller.php

modules/localplay/httpq/httpqplayer.class.php

modules/localplay/mpd/mpd.class.php

modules/localplay/mpd/mpd.controller.php

modules/localplay/upnp/upnp.controller.php

modules/localplay/upnp/upnpdevice.php

modules/localplay/upnp/upnpplayer.class.php

modules/localplay/upnp/upnpplaylist.php

modules/localplay/vlc/vlc.controller.php

modules/localplay/vlc/vlcplayer.class.php

modules/localplay/xbmc/xbmc.controller.php

modules/plugins/7Digital/7Digital.plugin.php

modules/plugins/Amazon/Amazon.plugin.php

modules/plugins/Bitly/Bitly.plugin.php

modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php

modules/plugins/ChartLyrics/ChartLyrics.plugin.php

modules/plugins/Flickr/Flickr.plugin.php

modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php

modules/plugins/GoogleMaps/GoogleMaps.plugin.php

modules/plugins/Growl/Growl.plugin.php

modules/plugins/Headphones/Headphones.plugin.php

modules/plugins/Lastfm/Lastfm.plugin.php

modules/plugins/Librefm/Librefm.plugin.php

modules/plugins/LyricWiki/LyricWiki.plugin.php

modules/plugins/MusicBrainz/MusicBrainz.plugin.php

modules/plugins/Omdb/Omdb.plugin.php

modules/plugins/Piwik/Piwik.plugin.php

modules/plugins/RSSView/RSSView.plugin.php

modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php

modules/plugins/StreamHits/StreamHits.plugin.php

modules/plugins/StreamTime/StreamTime.plugin.php

modules/plugins/TheAudioDb/TheAudioDb.plugin.php

modules/plugins/Tmdb/Tmdb.plugin.php

modules/plugins/Tvdb/Tvdb.plugin.php

modules/plugins/Yourls/Yourls.plugin.php

plex/web/index.php

preferences.php

scripts/tests/codestyle.sh

server/ajax.server.php

server/browse.ajax.php

server/catalog.ajax.php

server/democratic.ajax.php

server/edit.server.php

server/fs.ajax.php

server/index.ajax.php

server/localplay.ajax.php

server/player.ajax.php

server/playlist.ajax.php

server/random.ajax.php

server/refresh_reordered.server.php

server/search.ajax.php

server/song.ajax.php

server/stats.ajax.php

server/stream.ajax.php

server/tag.ajax.php

smartplaylist.php

templates/browse_filters.inc.php

templates/list_header.inc.php

templates/rightbar.inc.php

templates/show_account.inc.php

templates/show_add_catalog.inc.php

templates/show_add_upload.inc.php

templates/show_album.inc.php

templates/show_album_group_disks.inc.php

templates/show_album_row.inc.php

templates/show_albums.inc.php

templates/show_artist.inc.php

templates/show_artist_row.inc.php

templates/show_artists.inc.php

templates/show_arts.inc.php

templates/show_broadcast_row.inc.php

templates/show_broadcasts_dialog.inc.php

templates/show_catalog_row.inc.php

templates/show_catalog_types.inc.php

templates/show_channel_row.inc.php

templates/show_duplicates.inc.php

templates/show_edit_album_row.inc.php

templates/show_edit_artist_row.inc.php

templates/show_edit_playlist_row.inc.php

templates/show_edit_search_row.inc.php

templates/show_edit_share_row.inc.php

templates/show_edit_song_row.inc.php

templates/show_export.inc.php

templates/show_html5_player.inc.php

templates/show_install_lang.inc.php

templates/show_label.inc.php

templates/show_label_row.inc.php

templates/show_live_stream_row.inc.php

templates/show_localplay_controllers.inc.php

templates/show_localplay_status.inc.php

templates/show_login_form.inc.php

templates/show_lostpassword_form.inc.php

templates/show_lyrics.inc.php

templates/show_manage_catalogs.inc.php

templates/show_missing_album.inc.php

templates/show_missing_artist.inc.php

templates/show_now_playing.inc.php

templates/show_now_playing_row.inc.php

templates/show_now_playing_video_row.inc.php

templates/show_object_rating.inc.php

templates/show_object_row.inc.php

templates/show_object_userflag.inc.php

templates/show_partial_clip.inc.php

templates/show_partial_personal_video.inc.php

templates/show_partial_tvshow_episode.inc.php

templates/show_playlist_row.inc.php

templates/show_playlist_song_row.inc.php

templates/show_playlists_dialog.inc.php

templates/show_playtype_switch.inc.php

templates/show_plugins.inc.php

templates/show_popular.inc.php

templates/show_preference_admin.inc.php

templates/show_preference_box.inc.php

templates/show_pvmsg.inc.php

templates/show_pvmsg_row.inc.php

templates/show_random_albums.inc.php

templates/show_random_videos.inc.php

templates/show_recently_played.inc.php

templates/show_search_row.inc.php

templates/show_share.inc.php

templates/show_share_row.inc.php

templates/show_song.inc.php

templates/show_song_preview_row.inc.php

templates/show_song_row.inc.php

templates/show_songs.inc.php

templates/show_stats.inc.php

templates/show_stats_highest.inc.php

templates/show_stats_newest.inc.php

templates/show_stats_recent.inc.php

templates/show_stats_share.inc.php

templates/show_stats_upload.inc.php

templates/show_stats_userflag.inc.php

templates/show_stats_wanted.inc.php

templates/show_tagcloud.inc.php

templates/show_test_table.inc.php

templates/show_tvshow.inc.php

templates/show_tvshow_row.inc.php

templates/show_tvshow_season.inc.php

templates/show_tvshow_season_row.inc.php

templates/show_tvshow_seasons.inc.php

templates/show_tvshows.inc.php

templates/show_user.inc.php

templates/show_user_activate.inc.php

templates/show_user_registration.inc.php

templates/show_user_row.inc.php

templates/show_users.inc.php

templates/show_video.inc.php

templates/show_video_row.inc.php

templates/show_wanted_album_row.inc.php

templates/show_web_player.inc.php

templates/sidebar_home.inc.php

templates/sidebar_localplay.inc.php

templates/stylesheets.inc.php

tvshow_seasons.php

upnp/control-reply.php

upnp/playstatus.php

webdav/index.php

Older »