Commit Graph

151 Commits (0d3ebbfefdc65a90c78fa49c28eccbd1e0dfb563)

Author SHA1 Message Date
Michael Gapczynski 0d3ebbfefd Merge branch 'master' into sharing 2011-07-30 19:57:57 +07:00
Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
	lib/base.php
2011-07-30 19:40:19 +07:00
Robin Appelman 3a08f747fb more tweaks for media search results 2011-07-31 01:39:25 +07:00
Robin Appelman 0b44db954f dont show play and add-to-playlist at the same time 2011-07-31 01:25:33 +07: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 +07:00
Robin Appelman 18949aaa0b move public links to a subentry of files 2011-07-30 22:22:57 +07:00
Michael Gapczynski d13ba0ee2d Revise permissions system to support read, write, and delete 2011-07-30 16:03:32 +07:00
Jan-Christoph Borchardt 09e05d14a0 im in ur branch, fixin teh details 2011-07-30 14:40:10 +07:00
Jakob Sack 924cd17f2e Icewind destroyed my changes :-( 2011-07-30 08:56:08 +07: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 +07:00
Robin Appelman eee2a2266d disable unimplemented subentries for media player 2011-07-30 03:25:15 +07:00
Robin Appelman 773d23bbd5 open the correct subpage when the media player loads 2011-07-30 00:32:09 +07:00
Robin Appelman 93dd1c57cc update playcount correctly without having to reload the collection 2011-07-30 00:21:24 +07:00
Robin Appelman aa7c6f057b fix issue with selecting songs in playlist 2011-07-30 00:05:44 +07:00
Robin Appelman 94e25ecb0c Some much needed interface work on the media player 2011-07-29 23:55:54 +07:00
Michael Gapczynski f0c1f38f98 Add share action for mutliple selected files 2011-07-29 15:43:29 +07:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +07:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +07: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 +07:00
Michael Gapczynski 45222f34a6 Make 'Share' a subnavigation entry of of 'Files' 2011-07-29 12:20:01 +07:00
Michael Gapczynski 1fc41a7bfc Integrate sharing app with the new interface 2011-07-29 12:11:53 +07:00
Michael Gapczynski fcc9f50641 Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-07-29 10:23:15 +07:00
Jan-Christoph Borchardt 72402ff143 removed some more legacy CSS 2011-07-29 04:24:02 +07:00
Michael Gapczynski 67fe835f03 Add a function for removing any duplicate or trailing '/' from the paths 2011-07-28 20:28:22 +07:00
Michael Gapczynski 7e3b796de8 More elegant solution for preparing IN ?s, thanks icewind 2011-07-28 20:05:18 +07:00
Michael Gapczynski 5bc0619234 Add support for sharing files with user groups 2011-07-28 19:42:02 +07:00
Jan-Christoph Borchardt dbcebba882 show media icon in settings as well 2011-07-29 01:33:03 +07:00
Jan-Christoph Borchardt b88e5ce9a1 added icon to media app 2011-07-29 01:19:09 +07: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 +07:00
Jan-Christoph Borchardt ba246d3b27 Merge branch 'master' into interface 2011-07-28 22:20:34 +07:00
Michael Gapczynski 31a067b5a3 Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE 2011-07-28 15:31:52 +07:00
Robin Appelman bc51425bb7 keep track of playcount as last played time of music files 2011-07-28 20:59:36 +07:00
Robin Appelman aa33812104 hopefully fix some issues with the openid server 2011-07-28 20:12:07 +07: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 +07:00
Robin Appelman ece6bd663c show icons instead of text for file actions 2011-07-28 04:29:04 +07:00
Michael Gapczynski d36850f0f2 Close sharing dialog box on share success 2011-07-27 19:52:10 +07:00
Michael Gapczynski 64b5332f33 Make file sharing dialog work - only works for one file/folder and user 2011-07-27 19:25:33 +07:00
Jakob Sack 2f807a3c7f Delete requires in applications where possible 2011-07-27 19:25:49 +07:00
Robin Appelman 0dad1f8ccb merge master into interface 2011-07-27 16:42:58 +07: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 +07:00
Michael Gapczynski ff3140052a Merge branch 'master' into sharing 2011-07-26 21:29:44 +07:00
Michael Gapczynski 1ec0b6ecc1 jQuery dialog for sharing files from within file browser - Not functional yet 2011-07-26 21:27:40 +07:00
Robin Appelman 344b7f548b only show songs for which the current user has songs indexed 2011-07-26 22:21:28 +07:00
Robin Appelman d6d38ac3fa only load image viewer when in the file browser 2011-07-26 21:18:13 +07:00
Robin Appelman 48fe201dd5 fit player controls in smaller header 2011-07-26 16:43:41 +07:00
Robin Appelman 0e05a86484 some refactoring of the media player code 2011-07-26 16:05:24 +07:00
Michael Gapczynski 415ae8e40a Merge branch 'master' into sharing 2011-07-24 16:08:39 +07:00
Michael Gapczynski 5148eb9121 Include groups in user autocomplete 2011-07-24 16:07:39 +07:00
Michael Gapczynski 4282a42b3f Add support for user autocomplete 2011-07-24 15:47:37 +07:00
Michael Gapczynski 17b5bcb24f Bug fixes for unshare() and opendir(), thanks darkh 2011-07-24 14:38:01 +07:00