Commit Graph

222 Commits

Author SHA1 Message Date
Robin Appelman 7e0da0cb25 fix amapache url 2011-10-07 18:13:46 +02:00
Jan-Christoph Borchardt fa72f1c3cc some icon corrections 2011-10-07 16:18:47 +02:00
Marvin Thomas Rabe 7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00
Marvin Thomas Rabe de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00
Bart Visscher f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Robin Appelman 35d490f8e9 fix playing songs from search results 2011-09-29 23:55:00 +02:00
Robin Appelman fcc6d61fe1 only play the music once 2011-09-29 00:48:45 +02:00
Robin Appelman 0d40617c07 improvements in media collection viewer 2011-09-29 00:42:30 +02:00
Robin Appelman 8d3c3785bc sort music collection 2011-09-28 23:50:28 +02:00
Robin Appelman 93a0e668a6 styling fixes for playback controlls 2011-09-28 22:36:15 +02:00
Robin Appelman 1639a1ca49 fix persistent playlist for media player 2011-09-28 22:21:06 +02:00
Jan-Christoph Borchardt c39c6d36df do not use 'URL' but 'address' 2011-09-28 22:11:47 +02:00
Frank Karlitschek 98c59605aa show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration 2011-09-28 16:05:01 +02:00
Thomas Schmidt e30220e287 media app: show current song, add margin, enable tooltip 2011-09-28 11:46:04 +02:00
Bart Visscher c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Bart Visscher 17e631bc5e Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Robin Appelman 64b68f2474 correctly update the collection when music files are moved around 2011-09-25 01:34:55 +02:00
Jan-Christoph Borchardt ae4c83af91 moved scanning to controls bar 2011-09-25 00:17:54 +02:00
Jan-Christoph Borchardt 368412a730 lots of music improvements, might break some things though 2011-09-25 00:02:50 +02:00
Jan-Christoph Borchardt 408c391f83 removed deprecated images and icons 2011-09-24 22:09:41 +02:00
Robin Appelman 260893816b remove getID3 demos due to security issue caused by one of them 2011-09-24 19:09:54 +02:00
Florian Pritz 8648e3c43c only call error_log() if DEBUG is true
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Florian Pritz 9c550e8e9f fix error when uploading music
These methods are called statically so make them static.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:44 +02:00
Jan-Christoph Borchardt 5559a0dede updated translations 2011-09-23 19:08:02 +02:00
Robin Appelman 917ea58a8c fix file uploads for IE 2011-09-22 23:25:23 +02:00
Bart Visscher e990ef3542 Move some common code to OC_Util
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Bart Visscher 82c7598861 Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Bart Visscher 760b47a62f Use OC_Helper::linkTo also for absolute urls.
One central place to check for https.
2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt 1bf215cd08 updated translations 2011-09-03 15:08:58 +02:00
Côme BERNIGAUD b579c812b2 Some commented code was still here 2011-09-01 18:33:19 +02:00
Côme BERNIGAUD 31a094becb Buttons for play/add albums works. Folding albums too. 2011-09-01 18:31:44 +02:00
Robin Appelman 281b2187ab fix detection of empty collection 2011-08-28 23:20:08 +02:00
Robin Appelman d5c73c6d4a always scan new music files 2011-08-28 19:32:52 +02:00
Jan-Christoph Borchardt 0054197d02 updated translations 2011-08-28 01:14:32 +02:00
Jan-Christoph Borchardt f8fc8eb430 no alert popups, ever. They are just dismissed. Use undo instead. 2011-08-27 16:54:20 +02:00
Côme BERNIGAUD 56399d1d79 Play and add buttons in the collection. 2011-08-25 20:57:17 +02:00
Côme BERNIGAUD ce1d13c9b6 playlist working 2011-08-25 20:37:51 +02:00
Côme BERNIGAUD df560b3d9d Merge branch 'master' of git://anongit.kde.org/owncloud
Conflicts:
	apps/media/js/collection.js
2011-08-25 09:07:02 +02:00
Côme BERNIGAUD 3fbc8973ee My own version of music collection. 2011-08-25 09:04:08 +02:00
Robin Appelman e0ff57e8c2 fix javascript error in media player 2011-08-24 23:38:39 +02:00
Jan-Christoph Borchardt 900382057d updated translations 2011-08-23 11:20:37 +02:00
Robin Appelman c9a11d0aab some work on media player interface, artists can be collapsed in the collection view again and single albums/songs can be played 2011-08-21 15:28:20 +02:00
Jan-Christoph Borchardt 389b2775c2 translation update 2011-08-20 05:12:16 +02:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt 2ee9e80afe Swedish translation, thanks to HakanS 2011-08-18 14:33:05 +02:00
Jan-Christoph Borchardt 6720a45d65 updated translations 2011-08-18 11:46:49 +02:00
Robin Appelman 9f28c20660 fix collection browsing using the ampache api 2011-08-17 00:07:17 +02:00
Robin Appelman fd74e43afa fix expire header for media player 2011-08-16 14:35:05 +02:00
Robin Appelman 6f37f2917d fix media player controlls not showing 2011-08-13 17:53:31 +02:00
Robin Appelman ee8e6d5442 DONT always scan the collection, I would like to keep some cpu cycles to actually use my pc 2011-08-13 17:41:34 +02:00
Jan-Christoph Borchardt 595329a8a0 some player styling 2011-08-13 16:34:40 +02:00
Jan-Christoph Borchardt 2ba3793671 updated translations 2011-08-13 12:43:15 +02:00
Jan-Christoph Borchardt c144976676 start scanning music automatically when in Music 2011-08-13 07:02:51 +02:00
Jan-Christoph Borchardt ccf410c7b0 first styling for leftcontent 2011-08-13 07:02:25 +02:00
Jan-Christoph Borchardt 3b5f16b23c NEEDS MORE FADING 2011-08-13 06:05:00 +02:00
Jan-Christoph Borchardt 0c903c63d8 first replacement of media player controls with svg 2011-08-13 05:58:11 +02:00
Jan-Christoph Borchardt 7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Robin Appelman b0b5a46543 style media player controls using em instead of px 2011-08-13 00:23:15 +02:00
Robin Appelman 382834ec2b highlight playing songs in collection 2011-08-13 00:23:15 +02:00
Robin Appelman 5a26640f63 partly fix media player 2011-08-12 12:54:49 +02:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Robin Appelman 26ac7f0f1d get rid of some js errors on the login screen 2011-08-11 16:53:00 +02:00
Robin Appelman c9c1633882 some work on media player 2011-08-11 11:27:20 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jan-Christoph Borchardt 6aaa49d386 more media player fixes 2011-08-08 22:31:17 +02:00
Jan-Christoph Borchardt 3b34cba4ae first mediaplayer styling 2011-08-08 21:40:39 +02:00
Robin Appelman 8c34ea496a initial work on the media player interface rework
it looks bad atm bu should work enough to be stylable
2011-08-08 17:53:03 +02:00
Jan-Christoph Borchardt ecd2738e83 fixed upload button 2011-08-08 12:48:43 +02:00
Robin Appelman c998bc1215 fix some issues with browsers not supporting html5 localStorage 2011-08-06 10:08:26 +02:00
Robin Appelman 122c3a3cf8 dont show confusing 'X files scanned' message when we are not scanning files 2011-08-04 01:26:29 +02:00
Robin Appelman 93b342ee39 only load the music player outside the media app if the media app isnt already open in another tab 2011-08-04 01:19:21 +02:00
Robin Appelman 4851a55c1d cache the collection for the media player again 2011-08-03 15:36:47 +02:00
Robin Appelman de0e16a6f3 fix a bug in the media player outside the media app 2011-08-03 14:26:37 +02:00
Robin Appelman 8e5184a8b9 correctly save the playlist if songs are removed and dont load the player outisde the media app if the playlist is empty 2011-08-03 14:23:35 +02:00
Robin Appelman 957b9e8b84 send last modified header for media 2011-08-02 17:02:27 +02:00
Robin Appelman 900adb35d8 make the progres bar for scanning always go to the full 100% 2011-08-02 04:43:08 +02:00
Robin Appelman 02ebc4879a rename media to music in the navigation 2011-08-02 04:27:11 +02:00
Robin Appelman c0e7cf2e40 remove now useless 'media' entry from settings 2011-08-02 04:26:32 +02:00
Robin Appelman c814f10d7f fix media sub navigation entries 2011-08-02 04:14:54 +02:00
Robin Appelman 9f981de854 fance collection scanning wip 2011-08-01 23:55:47 +02:00
Robin Appelman 29239d6638 remember volume and playback time in the media player 2011-08-01 16:43:02 +02:00
Robin Appelman 30ce4e5b6b properly save play/pause state of media player 2011-08-01 16:20:15 +02:00
Robin Appelman ef22498c6f some fixes for persistent playlists 2011-08-01 01:59:57 +02:00
Robin Appelman 9b764cb7f4 show names of next/previous song when you hover the next/previous button 2011-08-01 01:25:34 +02:00
Robin Appelman 28a64bc2f8 fix an isue with persitent playlists inside the media player app 2011-08-01 01:21:50 +02:00
Robin Appelman 1933426e3e make the persitent playlist work anywhere 2011-08-01 01:20:00 +02:00
Robin Appelman e1596cc65a fix bug in saving currently played song 2011-08-01 01:17:54 +02:00
Robin Appelman 76a2f5b547 persistent playlist for the media player 2011-08-01 01:12:28 +02:00
Robin Appelman cbf8f822de automatically scan songs that are played from the filebrowser 2011-08-01 00:32:44 +02:00
Robin Appelman f88b477459 fix search results not displaying 2011-08-01 00:25:53 +02:00
Robin Appelman bd6b38e638 cache the media collection between page loads 2011-08-01 00:18:09 +02:00
Robin Appelman 2d19965750 some improvements to collection scanning 2011-08-01 00:07:46 +02:00
Robin Appelman 6e2ce76223 use db transitions for collection scanner 2011-07-31 20:25:13 +02:00
Robin Appelman aff8bc62d2 some improvements in oc_media_collections 2011-07-31 20:24:27 +02:00
Robin Appelman 3a08f747fb more tweaks for media search results 2011-07-31 01:39:25 +02:00
Robin Appelman 0b44db954f dont show play and add-to-playlist at the same time 2011-07-31 01:25:33 +02:00
Robin Appelman e6821e9d7c Show play and add-to-playlist buttons in instant search results
for now this only works from inside the media app
2011-07-31 00:50:04 +02:00
Jakob Sack 924cd17f2e Icewind destroyed my changes :-( 2011-07-30 08:56:08 +02:00
Robin Appelman 51e00d074c add play button to collection overview to add songs to the playlist and play them imediatly 2011-07-30 04:15:09 +02:00
Robin Appelman eee2a2266d disable unimplemented subentries for media player 2011-07-30 03:25:15 +02:00
Robin Appelman 773d23bbd5 open the correct subpage when the media player loads 2011-07-30 00:32:09 +02:00
Robin Appelman 93dd1c57cc update playcount correctly without having to reload the collection 2011-07-30 00:21:24 +02:00
Robin Appelman aa7c6f057b fix issue with selecting songs in playlist 2011-07-30 00:05:44 +02:00
Robin Appelman 94e25ecb0c Some much needed interface work on the media player 2011-07-29 23:55:54 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
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