Commit Graph

225 Commits

Author SHA1 Message Date
Deepak Mittal bd262eaac0 Fixed OC-261 by modifying js files in apps/media/ 2012-04-12 17:56:53 +02:00
Robin Appelman 8cea656ad7 upgrade getid3 2012-04-12 15:54:08 +02:00
Georg Ehrke 0d16f177cb add scrollbar to the music list - bugfix for oc-301 2012-03-28 16:21:54 +02:00
Bartek Przybylski 4b8ff4d910 media scanner fix 2012-03-11 17:29:21 +01:00
Bart Visscher d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Robin Appelman d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman 0b19af5e10 application/ogg is music to 2012-02-26 03:42:48 +01:00
Robin Appelman ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Marvin Thomas Rabe b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Robin Appelman c20319d377 fix incorrect information in the filecache when using encryption 2012-02-21 20:48:49 +01:00
Marvin Thomas Rabe 21f8d0992f Added missing files 2012-02-21 18:29:49 +01:00
Bart Visscher e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher 525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Robin Appelman c4a6b99814 use oc_filecache and oc_eventsource for music scanning 2012-02-08 17:30:16 +01:00
Robin Appelman a77f3a07a1 Fix some issues in ampache resonponse
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
Robin Appelman cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Robin Appelman 97901391f4 make media detection based on extention case insensitive 2012-01-20 19:34:34 +01:00
Robin Appelman 7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Robin Appelman 42ef44e1b4 show proper feedback that collection scanning is done and show the collection afterwards 2012-01-20 01:41:37 +01:00
Cloud Dumper 6ccb1187df Don't wrap collection cells.
This change makes sure cells are never wrapped.

If the text is too big for the column, ellipsis is
used instead.
2012-01-20 01:14:21 +01:00
Cloud Dumper d12afe0541 Sort songs also by path.
Add song_path in the ORDER BY.

Fix oc-31.
2012-01-20 01:14:01 +01:00
Michael Gapczynski 7859c1105c Apps need to be enabled in order to search through Shared directory for media scanning 2012-01-16 22:18:16 -05:00
Michael Gapczynski 1f35c94242 Make media app listen for post_delete instead of delete 2012-01-16 19:52:04 -05:00
Robin Appelman 965ea96439 update translations 2012-01-16 17:34:53 +01:00
Robin Appelman 15ea83834d prevent multiply owncloud instances on the same domain intefering with each others playlists 2012-01-15 19:25:55 +01:00
Cloud Dumper 6b50980469 Remove reference to unexisting file in music.css.
`img/pbar-ani.gif' is not on the repository.
2012-01-15 18:47:17 +01:00
Robin Appelman 5cd6e0f4d9 remove some of the flickering in opera 2012-01-15 00:14:42 +01:00
Robin Appelman b71ea287aa reimplement auto playing music from location hash (like from search results) 2012-01-12 02:02:45 +01:00
Robin Appelman 8de4163ba2 fix searching artists and albums 2012-01-12 02:01:59 +01:00
Robin Appelman 25213a790d fix event handler after re-expanding an artist in collection view 2012-01-12 01:18:27 +01:00
Robin Appelman 1b5d206ca7 fix expending artists and albums in collection view 2012-01-12 01:14:16 +01:00
Robin Appelman f4338f631b fix searching music 2012-01-12 00:54:35 +01:00
Robin Appelman 3c910b812b also use translated string for music navigation entry when showing inline controls 2012-01-11 01:26:27 +01:00
Robin Appelman f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Robin Appelman 13784bee18 mp3info is giving to much trouble, get rid of it 2012-01-08 17:35:40 +01:00
Kshitij Parajuli 041e3575d1 When a music file is playing, the page title gets modified. 2012-01-08 17:35:40 +01:00
Cloud Dumper 4d1ed7e05f Improve music playlist rendering.
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
  artist name, and the album the song is coming from.

No need to split this changeset into three different ones for the sake
of atomicity.

Two first elements were on the priorities / bug list available there:
   http://gitorious.org/owncloud/pages/Home
2012-01-08 13:45:44 +01:00
Cloud Dumper 5b57cd310e Also use track_number to retrieve song track.
This adds support for id3v2 tags such as TRACK/TOTAL.
2012-01-08 00:30:57 +01:00
Cloud Dumper 6b95d7427a Sort results from music collection getters.
Albums and artists are now ordered by name, song by track number and name.
2012-01-08 00:30:57 +01:00
Robin Appelman 536bc3d3c5 add jplayer source 2012-01-01 23:48:38 +01:00
Ignacio Daniel Rostagno 93502b3ef8 Music - Fix album and artist expand layout. 2011-11-24 02:55:51 +01:00
Robin Appelman 6c01175acd fix ampache htmlentity calls 2011-11-24 02:53:44 +01:00
Weng Xuetian 96b91e5b0b fix ampache encoding problem. use htmlentities encoding parameter directly. 2011-11-18 14:03:26 +01:00
Weng Xuetian 0d274b0268 fix id3 tag resolve. should use utf8 from getID3 directly but not
to convert them from ISO8859-1 to utf8 after analyze.
2011-11-18 14:03:26 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Michael Gapczynski 0d4240e196 Fix music navigation entry controls going over the sidebar 2011-10-22 02:31:16 -04:00
Brice Maron 9ea34250a0 Lower also the album name in media scanner... 2011-10-18 23:15:47 +02:00
Brice Maron b15d8878b7 Correct use of null for not null columns in media scanner 2011-10-18 22:41:25 +02:00
Robin Appelman 4d1776faf9 catch some edge cases in media player 2011-10-17 01:25:11 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman 330c513015 prevent error in media player ajax api 2011-10-17 00:25:13 +02:00
Robin Appelman b0127e3918 use OC_Log instead of error_log 2011-10-16 21:42:24 +02:00
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