Commit graph

355 commits

Author SHA1 Message Date
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
Michael Gapczynski
8c8490b28e Show users shared with in the drop down for reshared files 2011-08-24 18:41:36 -04:00
Robin Appelman
e0ff57e8c2 fix javascript error in media player 2011-08-24 23:38:39 +02:00
Arthur Schiwon
7cd592e055 Added a Bookmarklet for the Bookmarks app 2011-08-24 22:16:44 +02:00
Michael Gapczynski
365c4fdae2 Allow sharing of files shared with you - Bug: Doesn't show up as being shared in the drop down 2011-08-24 12:32:02 -04:00
Michael Gapczynski
4c4b1e4c2d Clear the folder size cache for the 'Shared' folder when a new item is shared 2011-08-24 11:59:03 -04:00
Arthur Schiwon
4028dc984a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-24 14:36:16 +02:00
Arthur Schiwon
0f3ef8aeb0 check if tag is set, might not show bookmarks on some systems without doing so 2011-08-24 14:36:03 +02:00
Jakob Sack
f4c498edba Full path for carddav path 2011-08-24 11:21:27 +02:00
Arthur Schiwon
b09ba58ca6 autoretrieve title and description after entering new url 2011-08-23 16:30:55 +02:00
Arthur Schiwon
847347b58a autoretrieve title and description after entering new url 2011-08-23 16:30:29 +02:00
Arthur Schiwon
672515c23f Bookmarks DB structure change, description is optional 2011-08-23 15:24:44 +02:00
Arthur Schiwon
89839b4c63 fetch bookmarks even if they are not tagged 2011-08-23 15:12:34 +02:00
Arthur Schiwon
7e1759e775 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-23 12:03:49 +02:00
Arthur Schiwon
3c3a859b89 follow coding style and use single quotes in php 2011-08-23 12:03:20 +02:00
Arthur Schiwon
72a4703d82 simplify bookmarks tag filter sql 2011-08-23 11:57:56 +02:00
Arthur Schiwon
53f0381f0f make tag filter compatible with sqlite 2011-08-23 11:43:27 +02:00
Jan-Christoph Borchardt
f5cef2fcbf cleaned up LDAP settings 2011-08-23 11:40:00 +02:00
Jan-Christoph Borchardt
3b10cddceb added icon for Admin 2011-08-23 11:37:29 +02:00
Jan-Christoph Borchardt
900382057d updated translations 2011-08-23 11:20:37 +02:00
Robin Appelman
391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Michael Gapczynski
96ad8a15b4 Register OC_Share for autoloading and cleanup hooks 2011-08-22 12:37:44 -04:00
Michael Gapczynski
c72187474a Check that the files exist before adding them to the fakedirs 2011-08-22 12:00:56 -04:00
Michael Gapczynski
1b64b7395c Update documentation for unshareFromMySelf() 2011-08-22 11:31:47 -04: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
Michael Gapczynski
0eda75a193 One more bug fix in clearFolderSizeCache() 2011-08-20 15:48:48 -04:00
Michael Gapczynski
f10f916f8c Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes 2011-08-20 15:43:18 -04:00
Michael Gapczynski
ceae4fa7b4 Fix bugs preventing file upload in shared folders with write permission 2011-08-20 12:36:20 -04:00
Michael Gapczynski
b05be2f26d Fix textviewer in search results 2011-08-20 12:18:56 -04:00
Michael Gapczynski
6afc17be1a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-20 12:03:22 -04:00
Michael Gapczynski
631152fc3e Implement searching of files shared with you 2011-08-20 12:03:03 -04:00
Jan-Christoph Borchardt
d15673f13f removed single quotes around publicly linked download file 2011-08-20 17:44:28 +02:00
Golnaz Nilieh
eac4d4ff06 When deleting a bookmark, remove its tags from database. 2011-08-20 12:38:15 +04:30
Jan-Christoph Borchardt
add0a90e1e single quotes in JavaScript & PHP, double quotes in HTML 2011-08-20 05:56:04 +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
Michael Gapczynski
c2f0fe51c4 Add getLocalFile() to OC_Filestorage_Shared 2011-08-19 20:05:57 -04:00
Michael Gapczynski
778b8543c1 Remove no longer needed functions in OC_Filestorage_Shared 2011-08-19 20:04:35 -04:00
Michael Gapczynski
ca86093270 Full support for viewing public links from sharing drop down 2011-08-19 12:47:00 -04:00
Golnaz Nilieh
5d310ebf92 * Use encodeEntities() function to check input
* Separate tags by space
2011-08-19 16:18:08 +04:30
Golnaz Nilieh
262a652710 Show new bookmark in the list after insertion, And hide it after deletion. 2011-08-19 13:30:05 +04:30
Michael Gapczynski
a57d4726bc Remove some scripts, now you can actually download the files in a public link folder 2011-08-18 19:44:00 -04:00
Michael Gapczynski
d1aebcddf2 Add downloadURL to files templates for both public links and files 2011-08-18 19:32:24 -04:00
Michael Gapczynski
498356fcb8 Copy get.php into files_sharing, public links now use files templates 2011-08-18 15:35:31 -04:00
Jan-Christoph Borchardt
4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Michael Gapczynski
594532da9a Merge public link icon check 2011-08-18 13:14:06 -04: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
Michael Gapczynski
8fb75f379a Comment rename() and prevent trying to move items if the user doesn't have write permission 2011-08-17 22:10:25 -04:00