Commit Graph

166 Commits

Author SHA1 Message Date
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
	lib/base.php
	lib/filestorage.php
2011-07-29 20:42:24 +02:00
Jan-Christoph Borchardt dbcebba882 show media icon in settings as well 2011-07-29 01:33:03 +02:00
Jan-Christoph Borchardt b88e5ce9a1 added icon to media app 2011-07-29 01:19:09 +02:00
Robin Appelman ab81128e5c dont throw error when the collection scanner cant detect the length of an audio file 2011-07-28 23:34:39 +02:00
Jan-Christoph Borchardt ba246d3b27 Merge branch 'master' into interface 2011-07-28 22:20:34 +02:00
Robin Appelman bc51425bb7 keep track of playcount as last played time of music files 2011-07-28 20:59:36 +02:00
Robin Appelman 0d408fe6f5 make use of the command line tools id3info and mp3info for scanning music if they are available 2011-07-28 20:10:58 +02:00
Robin Appelman ece6bd663c show icons instead of text for file actions 2011-07-28 04:29:04 +02:00
Jakob Sack 2f807a3c7f Delete requires in applications where possible 2011-07-27 19:25:49 +02:00
Robin Appelman 0dad1f8ccb merge master into interface 2011-07-27 16:42:58 +02:00
Robin Appelman 6585e83037 fix flash fallback for media player and bumb version of jplayer to 2.0.23 2011-07-27 16:40:26 +02:00
Robin Appelman 344b7f548b only show songs for which the current user has songs indexed 2011-07-26 22:21:28 +02:00
Robin Appelman 48fe201dd5 fit player controls in smaller header 2011-07-26 16:43:41 +02:00
Robin Appelman 0e05a86484 some refactoring of the media player code 2011-07-26 16:05:24 +02:00
Robin Appelman 41a2da234a remove some debug output and supress some possible errors 2011-07-22 19:37:25 +02:00
Robin Appelman 38f1cffab3 import media app 2011-07-22 06:30:52 +02:00