1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Commit graph

26 commits

Author SHA1 Message Date
Phyks (Lucas Verney)
e86ea9a099 Fix copyright date 2016-08-01 22:02:00 +02:00
Phyks (Lucas Verney)
2bb142eeb8 Fix issue #1260
Fix coding guidelines incoherences. Code should match PSR1/2 now, and
php-cs is set to check it on each commit.

Also fixed the Git hook to take into account only added, modified,
copied and renamed files (preventing errors when trying to check deleted
files).

Closes #1260.
2016-08-01 21:55:14 +02:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
Afterster
a340c30872 Update code style script with new checks 2015-11-18 22:39:49 +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
657ff21e43 Allow shout view for unregistered user if auth is not mandatory
Allow graph view for user owner
2015-11-06 21:54:41 +01:00
Afterster
e85e21ce92 Fix statistics Graph broken since Composer move (fix #966) 2015-09-23 07:06:10 +02:00
Afterster
16d80f8435 Use Composer for dependencies 2015-09-13 23:30:20 +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
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
b04208b5c3 Add methods to retrieve library item description and art with fallback to parent data 2015-04-05 10:21:43 +02:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
cbcc372cb9 Fix wrong download limit control hit calculation (fix #491) 2015-01-02 20:27:14 +01:00
Afterster
6f2cf6c5f2 Add Stream Control by Time plugin 2014-10-25 09:05:41 +02:00
Afterster
b98b1a5a95 Add count_type column on object_count table
Add stream control plugins (Hits and Bandwidth)
2014-10-24 07:48:50 +02:00
Afterster
e8d57fb4e6 Fix item art actions position 2014-10-10 07:40:45 +02:00
Afterster
dadf3d769b Display graph abscissa vertically 2014-10-08 23:36:15 +02:00
Afterster
77ab2bcfe8 Fix graph width sanity check 2014-10-08 23:22:39 +02:00
Afterster
5319cdf1d6 Add graphs to library items
Remove (temporary?) icon sprite from Reborn theme
2014-10-08 23:12:00 +02:00
Afterster
2b40dfc1cc Add GoogleMap geolocation view on graphs 2014-10-06 23:51:59 +02:00
Afterster
853da616f2 Add catalog graphs
Fixed #494: Logout on side menu is broken
2014-10-06 21:56:09 +02:00
Afterster
94f63ebcf7 Change graph legend position and default period length 2014-10-06 07:36:21 +02:00
Afterster
3102ab0bab Fix Scrutinizer issues 2014-10-06 07:26:48 +02:00
Afterster
72272d7b34 Change graphs default length 2014-10-06 01:21:53 +02:00
Afterster
2c221e8216 Add user geolocation and user statistical graphs 2014-10-06 01:05:17 +02:00