Phyks (Lucas Verney)
|
e86ea9a099
|
Fix copyright date
|
2016-08-01 22:02:00 +02:00 |
|
Afterster
|
9c3637b879
|
Change license from GPLv2 to AGPLv3
|
2015-12-02 20:46:34 +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
|
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
|
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 |
|
Lawrence Brown
|
60a653daf4
|
copyright 2014 -> 2015
janitorial services
|
2015-01-04 21:36:41 +00:00 |
|
Afterster
|
786c234d5f
|
Add tvshows / movies first objects
|
2014-07-05 10:25:12 +02:00 |
|