c4a6b99814
use oc_filecache and oc_eventsource for music scanning
2012-02-08 17:30:16 +01:00
a77f3a07a1
Fix some issues in ampache resonponse
...
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
cdfb252ced
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-24 00:24:09 +01:00
97901391f4
make media detection based on extention case insensitive
2012-01-20 19:34:34 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
42ef44e1b4
show proper feedback that collection scanning is done and show the collection afterwards
2012-01-20 01:41:37 +01:00
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
d12afe0541
Sort songs also by path.
...
Add song_path in the ORDER BY.
Fix oc-31.
2012-01-20 01:14:01 +01:00
7859c1105c
Apps need to be enabled in order to search through Shared directory for media scanning
2012-01-16 22:18:16 -05:00
1f35c94242
Make media app listen for post_delete instead of delete
2012-01-16 19:52:04 -05:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
15ea83834d
prevent multiply owncloud instances on the same domain intefering with each others playlists
2012-01-15 19:25:55 +01:00
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
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
b71ea287aa
reimplement auto playing music from location hash (like from search results)
2012-01-12 02:02:45 +01:00
8de4163ba2
fix searching artists and albums
2012-01-12 02:01:59 +01:00
25213a790d
fix event handler after re-expanding an artist in collection view
2012-01-12 01:18:27 +01:00
1b5d206ca7
fix expending artists and albums in collection view
2012-01-12 01:14:16 +01:00
f4338f631b
fix searching music
2012-01-12 00:54:35 +01:00
3c910b812b
also use translated string for music navigation entry when showing inline controls
2012-01-11 01:26:27 +01:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
13784bee18
mp3info is giving to much trouble, get rid of it
2012-01-08 17:35:40 +01:00
041e3575d1
When a music file is playing, the page title gets modified.
2012-01-08 17:35:40 +01:00
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
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
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
536bc3d3c5
add jplayer source
2012-01-01 23:48:38 +01:00
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
6c01175acd
fix ampache htmlentity calls
2011-11-24 02:53:44 +01:00
96b91e5b0b
fix ampache encoding problem. use htmlentities encoding parameter directly.
2011-11-18 14:03:26 +01:00
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
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
0d4240e196
Fix music navigation entry controls going over the sidebar
2011-10-22 02:31:16 -04:00
9ea34250a0
Lower also the album name in media scanner...
2011-10-18 23:15:47 +02:00
b15d8878b7
Correct use of null for not null columns in media scanner
2011-10-18 22:41:25 +02:00
4d1776faf9
catch some edge cases in media player
2011-10-17 01:25:11 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
330c513015
prevent error in media player ajax api
2011-10-17 00:25:13 +02:00
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
35d490f8e9
fix playing songs from search results
2011-09-29 23:55:00 +02:00
fcc6d61fe1
only play the music once
2011-09-29 00:48:45 +02:00
0d40617c07
improvements in media collection viewer
2011-09-29 00:42:30 +02:00
8d3c3785bc
sort music collection
2011-09-28 23:50:28 +02:00
93a0e668a6
styling fixes for playback controlls
2011-09-28 22:36:15 +02:00
1639a1ca49
fix persistent playlist for media player
2011-09-28 22:21:06 +02:00
c39c6d36df
do not use 'URL' but 'address'
2011-09-28 22:11:47 +02:00
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
e30220e287
media app: show current song, add margin, enable tooltip
2011-09-28 11:46:04 +02:00
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
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
64b68f2474
correctly update the collection when music files are moved around
2011-09-25 01:34:55 +02:00
ae4c83af91
moved scanning to controls bar
2011-09-25 00:17:54 +02:00
368412a730
lots of music improvements, might break some things though
2011-09-25 00:02:50 +02:00
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
260893816b
remove getID3 demos due to security issue caused by one of them
2011-09-24 19:09:54 +02:00
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
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
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
917ea58a8c
fix file uploads for IE
2011-09-22 23:25:23 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
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
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
1bf215cd08
updated translations
2011-09-03 15:08:58 +02:00
b579c812b2
Some commented code was still here
2011-09-01 18:33:19 +02:00
31a094becb
Buttons for play/add albums works. Folding albums too.
2011-09-01 18:31:44 +02:00
281b2187ab
fix detection of empty collection
2011-08-28 23:20:08 +02:00
d5c73c6d4a
always scan new music files
2011-08-28 19:32:52 +02:00
0054197d02
updated translations
2011-08-28 01:14:32 +02:00
f8fc8eb430
no alert popups, ever. They are just dismissed. Use undo instead.
2011-08-27 16:54:20 +02:00
56399d1d79
Play and add buttons in the collection.
2011-08-25 20:57:17 +02:00
ce1d13c9b6
playlist working
2011-08-25 20:37:51 +02:00
df560b3d9d
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
apps/media/js/collection.js
2011-08-25 09:07:02 +02:00
3fbc8973ee
My own version of music collection.
2011-08-25 09:04:08 +02:00
e0ff57e8c2
fix javascript error in media player
2011-08-24 23:38:39 +02:00
900382057d
updated translations
2011-08-23 11:20:37 +02:00
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
389b2775c2
translation update
2011-08-20 05:12:16 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
2ee9e80afe
Swedish translation, thanks to HakanS
2011-08-18 14:33:05 +02:00
6720a45d65
updated translations
2011-08-18 11:46:49 +02:00
9f28c20660
fix collection browsing using the ampache api
2011-08-17 00:07:17 +02:00
fd74e43afa
fix expire header for media player
2011-08-16 14:35:05 +02:00
6f37f2917d
fix media player controlls not showing
2011-08-13 17:53:31 +02:00
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
595329a8a0
some player styling
2011-08-13 16:34:40 +02:00
2ba3793671
updated translations
2011-08-13 12:43:15 +02:00
c144976676
start scanning music automatically when in Music
2011-08-13 07:02:51 +02:00
ccf410c7b0
first styling for leftcontent
2011-08-13 07:02:25 +02:00
3b5f16b23c
NEEDS MORE FADING
2011-08-13 06:05:00 +02:00
0c903c63d8
first replacement of media player controls with svg
2011-08-13 05:58:11 +02:00
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
b0b5a46543
style media player controls using em instead of px
2011-08-13 00:23:15 +02:00
382834ec2b
highlight playing songs in collection
2011-08-13 00:23:15 +02:00
5a26640f63
partly fix media player
2011-08-12 12:54:49 +02:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
26ac7f0f1d
get rid of some js errors on the login screen
2011-08-11 16:53:00 +02:00
c9c1633882
some work on media player
2011-08-11 11:27:20 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
6aaa49d386
more media player fixes
2011-08-08 22:31:17 +02:00
3b34cba4ae
first mediaplayer styling
2011-08-08 21:40:39 +02:00
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
ecd2738e83
fixed upload button
2011-08-08 12:48:43 +02:00
c998bc1215
fix some issues with browsers not supporting html5 localStorage
2011-08-06 10:08:26 +02:00
122c3a3cf8
dont show confusing 'X files scanned' message when we are not scanning files
2011-08-04 01:26:29 +02:00
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
4851a55c1d
cache the collection for the media player again
2011-08-03 15:36:47 +02:00
de0e16a6f3
fix a bug in the media player outside the media app
2011-08-03 14:26:37 +02:00
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
957b9e8b84
send last modified header for media
2011-08-02 17:02:27 +02:00
900adb35d8
make the progres bar for scanning always go to the full 100%
2011-08-02 04:43:08 +02:00
02ebc4879a
rename media to music in the navigation
2011-08-02 04:27:11 +02:00
c0e7cf2e40
remove now useless 'media' entry from settings
2011-08-02 04:26:32 +02:00
c814f10d7f
fix media sub navigation entries
2011-08-02 04:14:54 +02:00
9f981de854
fance collection scanning wip
2011-08-01 23:55:47 +02:00
29239d6638
remember volume and playback time in the media player
2011-08-01 16:43:02 +02:00
30ce4e5b6b
properly save play/pause state of media player
2011-08-01 16:20:15 +02:00
ef22498c6f
some fixes for persistent playlists
2011-08-01 01:59:57 +02:00
9b764cb7f4
show names of next/previous song when you hover the next/previous button
2011-08-01 01:25:34 +02:00
28a64bc2f8
fix an isue with persitent playlists inside the media player app
2011-08-01 01:21:50 +02:00
1933426e3e
make the persitent playlist work anywhere
2011-08-01 01:20:00 +02:00
e1596cc65a
fix bug in saving currently played song
2011-08-01 01:17:54 +02:00
76a2f5b547
persistent playlist for the media player
2011-08-01 01:12:28 +02:00
cbf8f822de
automatically scan songs that are played from the filebrowser
2011-08-01 00:32:44 +02:00
f88b477459
fix search results not displaying
2011-08-01 00:25:53 +02:00
bd6b38e638
cache the media collection between page loads
2011-08-01 00:18:09 +02:00
2d19965750
some improvements to collection scanning
2011-08-01 00:07:46 +02:00
6e2ce76223
use db transitions for collection scanner
2011-07-31 20:25:13 +02:00
aff8bc62d2
some improvements in oc_media_collections
2011-07-31 20:24:27 +02:00
3a08f747fb
more tweaks for media search results
2011-07-31 01:39:25 +02:00
0b44db954f
dont show play and add-to-playlist at the same time
2011-07-31 01:25:33 +02:00
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
924cd17f2e
Icewind destroyed my changes :-(
2011-07-30 08:56:08 +02:00
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
eee2a2266d
disable unimplemented subentries for media player
2011-07-30 03:25:15 +02:00
773d23bbd5
open the correct subpage when the media player loads
2011-07-30 00:32:09 +02:00
93dd1c57cc
update playcount correctly without having to reload the collection
2011-07-30 00:21:24 +02:00
aa7c6f057b
fix issue with selecting songs in playlist
2011-07-30 00:05:44 +02:00
94e25ecb0c
Some much needed interface work on the media player
2011-07-29 23:55:54 +02:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +02:00
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
dbcebba882
show media icon in settings as well
2011-07-29 01:33:03 +02:00
b88e5ce9a1
added icon to media app
2011-07-29 01:19:09 +02:00
ab81128e5c
dont throw error when the collection scanner cant detect the length of an audio file
2011-07-28 23:34:39 +02:00
ba246d3b27
Merge branch 'master' into interface
2011-07-28 22:20:34 +02:00
Robin Appelman
Cloud Dumper
Michael Gapczynski
Robin Appelman
Kshitij Parajuli
Ignacio Daniel Rostagno
Weng Xuetian
Brice Maron
Jan-Christoph Borchardt
Marvin Thomas Rabe
Bart Visscher
Frank Karlitschek
Thomas Schmidt
Jan-Christoph Borchardt
Florian Pritz
Bart Visscher
Côme BERNIGAUD
Jakob Sack