yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity
3000 commits 4 branches 18 tags 116 MiB
Commit graph

281 commits

Author SHA1 Message Date
John Moore
f4d7b64fd0 Merge branch 'master' of https://github.com/ampache-doped/ampache 
Conflicts:
	lib/class/ajax.class.php
	lib/general.lib.php
	themes/fresh/templates/default.css
 2013-11-19 19:27:31 -06:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
John Moore
f1ec89bb15 merging up to moset recent development branch 2013-11-15 20:18:16 -06:00
SUTJael
1e6404561f closes #10, closes #6; Cancel button can revert changes done when editing artist/album/song. Artist and Playlist edition is now working. 2013-11-10 12:07:45 +01:00
SUTJael
12303fee13 New feature: Play/Play all to play artist/album/song directly. This does not impact existing playlist. Optional. New feature: Dialog confirmation on "Reset from tags", "Reset Album Art" and "Delete" (on playlist) Enhancement: Change "Not Enough Data" message to something personalized for each components. Enhancement: Make playlist action's text clickable. 
Need to update languages and regenerate .mo files.
 2013-11-10 12:07:43 +01:00
Afterster
5c618a9696 Add user flags on songs, albums, artists 
Bug fix rating on stats page (object id conflict)

Bug fix cell alignment when rating disabled
 2013-11-10 12:07:30 +01:00
Afterster
c634d779d3 Only one HTML5 player in the list. Popup or Iframe version according to user setting. 2013-11-09 13:32:54 +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
John Moore
3b8d0f3430 its ugly and we need some serious jquery UI niceness but we are tagging!! 2013-07-25 20:16:23 -05:00
John Moore
ed26c1a51a initial shot at tagging songs 2013-07-25 19:02:44 -05:00
Paul Arthur
0a2f173122 Fix random album 2013-07-22 17:05:46 -04:00
Paul Arthur
c952ca6fa3 Be smarter about getting random albums with art 
Just ask the database for what we want instead of asking for more
results, sifting through them, and hoping that we get enough
qualifying results to fulfill the request.

Also drop Random::album(), since it's duplicate code and it makes more
sense for this to live in Album.
 2013-07-22 16:54:47 -04:00
Paul Arthur
4b4e7decf6 Try to fix remote streaming 2013-03-28 16:56:21 -04:00
Paul Arthur
5bc48fd3b2 Fix xml.server.php after changes to session 
It was calling the wrong method in Session, which is entirely my fault.
Also, the correct method was broken. Gah.
 2013-02-11 17:23:33 -05:00
Paul Arthur
266f7cea9b Fix persistent XSS vulnerabilities in AJAX editing 
Based on merge request #22 from Jean-Lou Hau, but does the escaping for
everything and in a different place.
 2013-02-07 15:20:44 -05:00
Paul Arthur
101f4a047a Cosmetics: s/Itterate/Iterate/ 2013-01-28 21:46:00 -05:00
Paul Arthur
58a3ab692e Move sessiony things from vauth into Session 2013-01-28 16:57:34 -05:00
Paul Arthur
1a164ba699 Yank out the Flash player by the roots. 2013-01-28 13:26:11 -05:00
Holger Brunn
959aebe07f Add an HTML5 player 
Merge request #20.  Basic, not very pretty, but works and, unlike the
Flash player, is maintainable.
 2013-01-28 13:26:11 -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
136f9f5856 Move ajax_include() from ui.lib.php to UI 2013-01-26 01:35:59 -05:00
Paul Arthur
d14b5215eb Cosmetics: s/incase/in case/ 2013-01-25 20:30:36 -05:00
Paul Arthur
9c28ed5ad1 Consistently use _ in two-word class names 2013-01-25 19:54:11 -05:00
Paul Arthur
0c66442b55 require and require_once aren't functions 
Since the parentheses are optional, we leave them off to remind ourselve
that PHP be crazy, yo.
 2013-01-25 19:20:47 -05:00
Paul Arthur
d87c539500 Cosmetics: clean up heads in server/ 2013-01-25 19:05:28 -05:00
Paul Arthur
bc90c0128c Start cleaning up the democratic thing. 
Whoever wrote the old implementation of get_items suffered from intense fear
and hatred of SQL.
 2012-10-15 13:20:28 -04:00
Paul Arthur
8c4921f5f3 Consistently use 'object_type' in playlist returns 2012-10-15 13:20:27 -04:00
Paul Arthur
f65076b93d Switch from _() to T_() 
Even if we move away from php-gettext in the future, it's easy to
write a quick T_() as a simple wrapper; it's not so easy to rewrite
PHP to allow redeclaration of a function.
 2012-04-12 21:13:29 -04:00
Paul Arthur
34b0eaf233 Clean up uses of Config::set and Config::set_by_array 
Consistently pass in a boolean instead of a string or an int for the
clobber flag.
 2012-03-06 12:18:57 -05:00
Karl Vollmer
cfaa308ee7 Disallow ballot stuffing 2011-10-26 00:25:53 -04:00
dipsol
fcc8ff2842 FS#189 Fixed dropdown selection 2011-09-14 16:20:48 +02:00
Paul Arthur
4aa256cb07 Clean up some PHPDoc crap 
Remove misleading, unvetted, or in some cases just plain wrong data.
Packages and categories weren't being used correctly.  They still
aren't.
 2011-04-04 17:37:10 -04:00
Paul Arthur
a9da6a6fa2 Reworked search 
Still has tentacles and should have been integrated into the existing
API/Browse implementation better, but it's functional.
 2011-04-02 00:48:58 -04:00
momo-i
f99643663c header comment modified for phpdoc 2011-02-03 09:43:46 +09:00
Chris Slamar
4910d13fa4 Catalog Filtering Added Bug#60 2011-01-24 19:25:01 -06:00
Karl Vollmer
fc355baf67 Disallow ballot stuffing 2011-01-13 08:33:40 -04:00
Paul 'flowerysong' Arthur
6277492321 JavaScript cleanup. Consistently use camelCase for naming JS functions. Use 
Prototype functionality where possible (particularly for Ajax).  Move our JS
into lib/javascript (I dropped kajax as an external module since the new
ajax.js is completely different apart from function headers.)  Remove unused
JS functions from base.js.
 2010-06-24 02:52:01 +00:00
Paul 'flowerysong' Arthur
4b5756ba9d Miscellaneous cleanup. 2010-06-13 08:11:09 +00:00
Paul 'flowerysong' Arthur
7f36693353 Change Browse from static to instantiable. Among other things, fixes FS#13; 
probably also breaks things.  Most things appear to still work, but I may have
missed some cases.
 2010-06-10 05:33:57 +00:00
Paul 'flowerysong' Arthur
b95a7b1ecc I should have done it this way in the first place, instead of that ugly 
show_playlist_full_row hack.
 2010-06-09 01:35:50 +00:00
Paul 'flowerysong' Arthur
b9937cd7ce Clean up the rating code by moving uniqueness constraints into the database, 
using SQL's AVG() when we want an average, updating the cache when a rating
changes, etc.
 2010-06-07 00:49:47 +00:00
Paul 'flowerysong' Arthur
b290f52c8d Some missed hunks for playlist editing and miscellaneous related cleanup. 2010-04-28 22:20:42 +00:00
Karl 'vollmerk' Vollmer
b2efc456d0 Fix typo in api Thx cosmin 2010-03-24 12:03:01 +00:00
Paul 'flowerysong' Arthur
1cb0983ed0 Cosmetics: remove trailing whitespace 2010-03-14 20:14:52 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
Karl 'vollmerk' Vollmer
45ea1a80fa Make the tag cloud do something, only song browsing for now... 2010-02-23 04:12:42 +00:00
Karl 'vollmerk' Vollmer
24761d3863 Removed dead xmlrpc files, started work migrating to LastFM v2.0 api 2010-02-05 01:29:20 +00:00
Karl 'vollmerk' Vollmer
146012c4ef sync from 3.5.x r2268 2010-02-02 21:13:34 +00:00
Karl 'vollmerk' Vollmer
c6566e8d1b Fix refreshing of localplay playlist when an item is removed 2010-02-02 20:51:54 +00:00
Karl 'vollmerk' Vollmer
ef21e122d1 Finish moving stuff out of doc into class, still needs more work to deal with Version as well as variable response (JSON) 2009-11-23 14:54:19 +00:00