Commit Graph

198 Commits

Author SHA1 Message Date
Scott Barnett f4ecf47e61 Fixed delete cross positioning issue. 2011-09-27 05:26:49 +10: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
Florian Pritz d928cd3636 files: hide non functioning code when called from a/f_s/get.php
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.

The actions div contains undefined variables and doesn't work either.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:54 +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
Michael Gapczynski 8c8490b28e Show users shared with in the drop down for reshared files 2011-08-24 18:41:36 -04: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
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
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 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
Jan-Christoph Borchardt add0a90e1e single quotes in JavaScript & PHP, double quotes in HTML 2011-08-20 05:56:04 +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
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
Michael Gapczynski 594532da9a Merge public link icon check 2011-08-18 13:14:06 -04: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
Michael Gapczynski b4cf61ee32 Bug fixes for mkdir(), renaming/moving support for files inside a shared folder with write permission 2011-08-17 21:58:53 -04:00
Michael Gapczynski 4078e0a242 -1 is now a class constant (UNSHARED), for unsharing files from self 2011-08-17 18:00:37 -04:00
Michael Gapczynski 1303e40b6e Remove navigation entry for shared files 2011-08-17 17:44:10 -04:00
Michael Gapczynski 5b8658ca10 New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self 2011-08-17 17:43:15 -04:00
Michael Gapczynski 1c13b2681a Fix my last commit 9ee4fc 2011-08-17 14:22:14 -04:00
Michael Gapczynski 9ee4fcdf2f Only show 'Shared' directory if files are shared with you 2011-08-17 13:47:10 -04:00
Michael Gapczynski 5925697374 Fix bug in getPermissions() and clean-up unlink() and rename() 2011-08-17 12:58:09 -04:00
Michael Gapczynski b7b3a49203 Functions to get the token of a public link now stored by OC_Share, remove no longer needed ajax call to getlink.php 2011-08-16 21:32:51 -04:00
Michael Gapczynski 0edce1796b Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-16 20:21:57 -04:00
Michael Gapczynski 582dca4d91 Initial merging of files_sharing and files_publiclink 2011-08-16 20:21:18 -04:00
Robin Appelman 42ed3c6b7e fix problem with building the IN query 2011-08-17 00:34:02 +02:00
Michael Gapczynski 717ab56419 Display public icon next to publicly shared files 2011-08-16 12:18:31 -04:00
Michael Gapczynski 726933831d Public link folder uploading not implemented, comment out checkbox for it in dropdown 2011-08-16 12:06:08 -04:00
Michael Gapczynski e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski 5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski 5b09aef166 Additional user group sharing support and more clean-up in the constructor 2011-08-15 17:37:16 -04:00
Michael Gapczynski 5cb687d168 Refactor getUserAndGroups() for new user group sharing standard - user@group 2011-08-14 12:16:14 -04:00
Michael Gapczynski e1473cfe83 Change OC_GROUP to OC_Group 2011-08-14 11:44:37 -04:00
Michael Gapczynski 3c517499bb OC_Share constructor refactored for user group sharing 2011-08-12 20:49:44 -04:00
Michael Gapczynski 497789cdd8 Clean up constructor for OC_Share, add some error handling for sharing files 2011-08-12 17:22:32 -04:00
Michael Gapczynski a8e6be6016 Change the share file action icon if the file is already shared with someone 2011-08-12 11:34:17 -04:00
Michael Gapczynski 9e35d5a886 Remove hardcoded http:// when generating public links 2011-08-11 16:56:09 -04:00
Michael Gapczynski c65046773d Make unshare work from dropdown 2011-08-11 14:20:50 -04:00
Michael Gapczynski 6d25943f2f Fix some areas on dropdown triggering the dropdown to hide 2011-08-11 12:50:29 -04:00
Michael Gapczynski 0ad0ed77c5 Hide the dropdown if you click the share file action button 2011-08-11 12:03:48 -04:00
Michael Gapczynski 0f91438b80 Don't spawn a new dropdown if there is already one open 2011-08-11 11:52:10 -04:00
Michael Gapczynski 2af0269eb9 Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
Conflicts:
	apps/files_sharing/js/share.js
2011-08-11 11:15:17 -04:00
Michael Gapczynski 103d23b3a3 Refactoring in dropdown javascript 2011-08-11 11:09:14 -04:00
Jan-Christoph Borchardt 568fd0df83 changed quotes 2011-08-11 13:53:25 +02:00
Jan-Christoph Borchardt 511c193631 only load share action when in file browser 2011-08-11 13:33:43 +02:00
Michael Gapczynski 80660bdc07 Fix shared list for files inside of shared folders 2011-08-10 13:38:58 -04:00
Michael Gapczynski 88e338ec23 Only show can edit (if not checked) and unshare button on hover 2011-08-09 17:55:51 -04:00
Michael Gapczynski 7c840e9bbb Remove users and groups from the select form that have already been shared with 2011-08-09 11:00:14 -04:00
Michael Gapczynski c654442901 No more subnavigation entries, fixing 'Shared' 2011-08-09 10:45:12 -04:00
Michael Gapczynski cdf2dbcd52 Use chosen select form for selecting users in sharing drop down 2011-08-09 10:34:00 -04:00
Michael Gapczynski 23c8d7b3fb Show which parent folder is shared with the user in the sharing drop down 2011-08-08 15:49:16 -04:00
Michael Gapczynski 5d521d7c7c Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions 2011-08-07 15:20:57 -04:00
Michael Gapczynski 843f8aca7c Full support for making and deleting public links from share dropdown 2011-08-05 11:18:35 -04:00
Michael Gapczynski 8f01abf054 Share dropdown updates, making public links now works 2011-08-03 15:21:53 -04:00
Michael Gapczynski 96ab35a331 Animate appearance of share drop down 2011-08-02 15:23:17 -04:00
Jan-Christoph Borchardt d0b2a3b1ac moved dialog css to sharing, fixed position 2011-08-02 19:30:18 +02:00
Jan-Christoph Borchardt d71cca0e81 first style for sharing dropdown, some html fixes 2011-08-02 18:58:33 +02:00
Michael Gapczynski 0d79560e94 New implementation of share dialog 2011-08-02 12:19:49 -04:00
Michael Gapczynski ddfc9fc001 Move registering shared storage out of base 2011-08-01 10:58:15 -04:00
Michael Gapczynski 57ca70e27c Add support for assigning permissions in share dialog and switch to post 2011-07-31 20:47:53 -04:00
Michael Gapczynski a14a83b9c6 Fix delTree(), it shouldn't be passed to the local storage provider unless the user has delete permission 2011-07-31 15:02:59 -04:00
Michael Gapczynski c185743ae9 Update the folder sizes for shared folders 2011-07-31 14:48:23 -04:00
Michael Gapczynski f88c4b1f48 Human readable permissions in shared files list 2011-07-31 13:15:07 -04: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 -04:00
Michael Gapczynski d13ba0ee2d Revise permissions system to support read, write, and delete 2011-07-30 16:03:32 -04:00
Jan-Christoph Borchardt 09e05d14a0 im in ur branch, fixin teh details 2011-07-30 14:40:10 +02:00
Michael Gapczynski f0c1f38f98 Add share action for mutliple selected files 2011-07-29 15:43:29 -04:00
Michael Gapczynski 45222f34a6 Make 'Share' a subnavigation entry of of 'Files' 2011-07-29 12:20:01 -04:00
Michael Gapczynski 1fc41a7bfc Integrate sharing app with the new interface 2011-07-29 12:11:53 -04:00
Michael Gapczynski 67fe835f03 Add a function for removing any duplicate or trailing '/' from the paths 2011-07-28 20:28:22 -04:00
Michael Gapczynski 7e3b796de8 More elegant solution for preparing IN ?s, thanks icewind 2011-07-28 20:05:18 -04:00
Michael Gapczynski 5bc0619234 Add support for sharing files with user groups 2011-07-28 19:42:02 -04: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 -04:00
Michael Gapczynski d36850f0f2 Close sharing dialog box on share success 2011-07-27 19:52:10 -04:00
Michael Gapczynski 64b5332f33 Make file sharing dialog work - only works for one file/folder and user 2011-07-27 19:25:33 -04:00
Michael Gapczynski 1ec0b6ecc1 jQuery dialog for sharing files from within file browser - Not functional yet 2011-07-26 21:27:40 -04:00
Michael Gapczynski 5148eb9121 Include groups in user autocomplete 2011-07-24 16:07:39 -04:00
Michael Gapczynski 4282a42b3f Add support for user autocomplete 2011-07-24 15:47:37 -04:00
Michael Gapczynski 17b5bcb24f Bug fixes for unshare() and opendir(), thanks darkh 2011-07-24 14:38:01 -04:00
Michael Gapczynski 4993fb4665 Filter out files you unshare from yourself in opendir() 2011-07-23 14:41:01 -04:00
Michael Gapczynski e6e673d7c0 Use SUBSTR instead of LIKE in queries, should now work with SQLite 2011-07-22 20:41:16 -04:00
Michael Gapczynski 302527c2d6 Remove shared items check, it prevents sharing items if there aren't already any. 2011-07-21 14:53:51 -04:00
Michael Gapczynski 4abefde290 Remove admin page, administration is not needed at this time for sharing 2011-07-20 16:54:06 -04:00
Michael Gapczynski 6af4c465b8 Change all occurences of ['user_id'] to OC_USER::getUser() 2011-07-20 16:52:01 -04:00
Michael Gapczynski fcda3a338c Fix bug in constructor for appending numbers to already existing targets 2011-07-20 16:41:39 -04:00
Michael Gapczynski 3e6037659e Change permissions to is_writeable 2011-07-20 15:42:49 -04:00
Michael Gapczynski 22f8415045 Remove accidental kate swap file 2011-07-20 14:46:01 -04:00
Michael Gapczynski 1cfa911ce3 Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider 2011-07-20 14:42:48 -04:00
Michael Gapczynski c9082d5b0d Append number to name if target file already exists 2011-07-20 14:16:20 -04:00
Michael Gapczynski 029b21bf54 First implementation of sharing user interface 2011-07-20 13:34:16 -04:00