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

41 commits

Author SHA1 Message Date
Afterster
58fa76fe3d Display large covert arts if grid view is disabled for target item type 2015-12-19 15:55:12 +01: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
Maniac
cfe1b1371e Fixed missing space in get_icon method when using sprites 2015-08-13 08:51:03 +02:00
Niols
35477d0a5e Add UI::find_template method and its allow_php_themes argument 2015-06-06 18:53:38 +02:00
Afterster
2b100a73cf Add Piwik and Google Analytics statistic modules
Hide user agent from recently played if not at least a content manager user
2015-05-01 18:25:58 +02:00
Afterster
4dfd3ae018 Better user upload error feedback
Avoid message quote error in javascript notification
2015-04-15 23:19:33 +02:00
Afterster
a2caf2d66a Add an option to customize login art, favicon and text footer 2015-04-15 21:20:26 +02:00
Afterster
d2775ecc2f Fix custom header logo style 2015-04-12 22:20:26 +02:00
Afterster
391d27da74 Set custom logo on login & registration pages if setup. Also check for a local custom favicon in that case. 2015-04-11 09:49:43 +02:00
Afterster
c763103bee Add Server-Sent Events on catalog actions 2015-02-02 22:45:57 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
cd53d38c51 Include tabledata.js only once, before footer 2014-11-20 20:55:13 +01:00
Afterster
66dd1ff782 Image art on artists edition and index display preferences 2014-09-15 07:37:17 +02:00
Afterster
49cd42562b Replace iframe with Ajax page loading :) :) 2014-08-08 01:36:07 +02:00
Afterster
b16958f44e Remove old code and fix old php errors 2014-05-25 22:54:04 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
SUTJael
abba0441f9 Fix #128 2014-04-18 18:00:59 +02:00
Jean-François Bilger
25f10ee47e [MOD] Sprite integration for reborn themes and class mechanism 2014-04-08 22:40:07 +02:00
SUTJael
7e4e12f53b Fix #173. Fix rating. Fix plenty of Warnings. 2014-03-27 15:28:58 +01:00
SUTJael
7c2f8b0f26 Actions on rows are now displayed on mouse-hover. Removed all unused parameters. Song/artists/albums title are displayed correctly (truncate has been removed). Add to an existing playlist implementation started. 2014-01-15 20:47:49 +01:00
Afterster
3de944a344 Previous regex was faster. Restore. 2014-01-12 11:26:30 +01:00
Afterster
17e8bbd817 Change clean_utf8 regex with a quicker one 2014-01-12 11:06:13 +01:00
Afterster
5eceaf2aea Rename Config class to AmpConfig class to avoid conflict with PEAR (fix #68) 2013-12-13 08:36:23 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Afterster
99ad5f7f82 HTML5 player replaced by JPlayer and add an iframed version of the player 2013-11-09 13:32:47 +01:00
Paul Arthur
ab18569013 UI: Fix $hover_name 'Undefined variable' warnings 2013-02-02 20:51:26 -05:00
Paul Arthur
04347b9a59 Move UTF-8 cleanup into its own method 2013-01-29 11:33:32 -05:00
Paul Arthur
75b2af2464 Fix flip_class 2013-01-28 21:48:17 -05:00
Paul Arthur
ef4d366060 Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference
for spaces, and I feel inclined to impose my will on the tree.
2013-01-26 03:38:46 -05:00
Paul Arthur
8a750c3e87 Move [un]format_bytes() from general.lib.php to UI 2013-01-26 02:36:58 -05:00
Paul Arthur
a12679b13d Move get_user_icon from ui.lib.php to UI::get_icon 2013-01-26 02:19:06 -05:00
Paul Arthur
80b618ba40 Move update_text from ui.lib.php to UI 2013-01-26 01:42:52 -05:00
Paul Arthur
136f9f5856 Move ajax_include() from ui.lib.php to UI 2013-01-26 01:35:59 -05:00
Paul Arthur
d572c2776f Move show_box_{top,bottom}() from ui.lib.php to UI 2013-01-26 01:28:34 -05:00
Paul Arthur
04aa79b53c Move show_{footer,header}() from ui.lib.php to UI 2013-01-26 01:22:50 -05:00
Paul Arthur
eaa44dcd09 Continue moving things into UI
check_php_iconv() from lib/debug.lib.php becomes UI::check_iconv()
truncate_with_ellipsis() from lib/ui.lib.php becomes UI::truncate()
2013-01-26 01:15:59 -05:00
Paul Arthur
42133f38d2 Move access_denied() from lib/ui.lib.php to UI 2013-01-26 00:57:40 -05:00
Paul Arthur
5f02e4f43c Move flip_class() from lib/ui.lib.php to UI 2013-01-26 00:52:50 -05:00
Paul Arthur
e2d3c94800 Catalog::_check_ticker() -> UI::check_ticker() 2013-01-26 00:30:26 -05:00