70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
05648dac61
Don't return file handle if the mode supports writing and the file is not writable
2012-08-08 11:25:24 -04:00
03d65af5dc
Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible
2012-08-06 15:09:01 -04:00
83117445ac
Fix offset for folder detection, no longer including '/Shared' in file target path
2012-08-06 14:33:47 -04:00
ba0cf98175
Remove extra line, caused 'headers already sent' issues
2012-08-06 13:33:53 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
dab708b625
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-30 10:07:20 -04:00
7d17c59a51
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-30 10:07:19 -04:00
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
7ff04be091
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-28 11:06:36 -04:00
df9f5b902a
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-27 15:34:51 -04:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
add8f09355
No longer need hash() in shared storage, already implemented by the common file storage
2012-07-25 17:13:48 -04:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
fc72d4b10f
Add root directory checks for CRUDS permissions in shared storage
2012-07-24 21:16:47 -04:00
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
c60c6024a7
Remove toTmpFile() from shared storage, no longer needed
2012-07-24 14:50:43 -04:00
eac297e8c4
Improve file source caching for shared folders
2012-07-24 14:41:19 -04:00
e8675586af
Fix permission check for rmdir(), implement unlink(), rename(), and copy()
2012-07-24 14:22:07 -04:00
e6678bd454
Permission check should be made on parent folder when creating a new folder
2012-07-23 22:39:29 -04:00
7b01e3285e
Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage
2012-07-23 22:05:53 -04:00
48ec78299e
cleanup some obsolete foldersize code from the shared storage backend
2012-07-21 00:20:27 +02:00
38271ded75
Added CSRF checks
2012-07-20 20:12:36 +02:00
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
0bd7d14b7a
Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships
2012-07-17 14:09:01 +02:00
225726c8d9
latin1 => utf8. I thought I did this a month ago?
2012-07-16 01:41:45 +02:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
50eef9a71c
update script to fix fscache
2012-07-13 15:17:36 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
7b2ec41477
Revert santizing toaddress, because PHPMailer now throws exceptions
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
ebcf5bce3c
Sanitize toaddress for emailing private links
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
91a15bae76
Revert santizing toaddress, because PHPMailer now throws exceptions
2012-07-11 16:02:43 -04:00
7077678f7f
Sanitize toaddress for emailing private links
2012-07-11 15:26:22 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
bf93dd4661
Don't reload the page after sending private link to email address
2012-07-01 11:53:29 -04:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
895d5707ee
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:09:11 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
6308ca6b8a
Merge branch 'shared_log'
2012-06-20 17:20:46 +02:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
a1364c9726
fixes oc-1026
2012-06-18 22:48:52 +02:00
ec3033a5dd
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-15 19:34:25 -04:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
f3b30e4658
Forgot $ sign for variable
2012-06-14 15:14:01 -04:00
f7e686d4f1
Revert "Fix a counting mistake"
...
This reverts commit c20abfef38
2012-06-14 15:05:20 -04:00
b025ff8de3
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:33:00 +02:00
12bfc551fb
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:31:38 +02:00
6e15b231b0
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-14 12:27:30 -04:00
4510571aa1
Add app for logging access to shared files
2012-06-14 17:44:41 +02:00
7868b25dcc
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:34:35 -04:00
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04:00
3be5e2af26
utf8 in der DB config
2012-06-11 23:04:28 +02:00
8c7fa15aaf
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:58:00 +02:00
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
d8ca4f78cf
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:36:39 -04:00
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
b7aee58ef9
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
2012-05-17 21:26:55 -04:00
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
5cf42b88af
Replace all %2F with a / in private link
2012-05-14 20:21:31 -04:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
d4271ed9df
Use original source when resharing a file, fixes bug oc-210
2012-05-14 17:31:03 -04:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
0fb90fa875
set public handeler in info,xml for sharing
2012-05-14 00:28:27 +02:00
b4e7c05959
Encoded slashes (%2F) don't look pretty in our private link urls
2012-05-11 20:58:21 -04:00
faebee5f25
Turn async off when fetching users to make sure the users get removed from the select form
2012-05-11 20:39:48 -04:00
daff3aa667
Prevent overwriting of private link status
2012-05-10 21:06:45 -04:00
60103d9b94
Only mount shared storage after a user has logged in, fixes shared folder not appearing for some WebDAV clients and sync client
2012-05-10 19:56:41 -04:00
3c6c8ecab0
Make email private link submit on enter as well
2012-05-10 11:44:06 -04:00
93c0e8b3bf
Fix unsharing files also deleting private link, bug fix for oc-251
2012-05-09 17:38:35 -04:00
98cd98e2e5
Skip over users that have already been shared with when sharing with a group
2012-05-09 17:16:31 -04:00
d4636f4b86
Fix renaming of shared files if target already exists, bug fix for oc-81
2012-05-09 17:01:46 -04:00
2e826fa82a
Go back to updating mtime of shared folder to invoke a file cache rescan
2012-05-09 16:20:38 -04:00
3e57e76c48
fix creating the shared folder when the user home folder is not in the root mount
2012-05-09 20:36:08 +02:00
14b240a3f4
Still trying to fix some sharing use cases
2012-05-09 13:51:52 -04:00
eb7e2d7d35
Sharing: even if a user has more groups in common, he should appear only once in the dropdown list
2012-05-09 11:35:36 +02:00
f6df71b74d
Set Content-Disposition to attachment for shared private links
2012-05-08 10:27:02 -04:00
010b97febd
Avoid touch operation when unshare public link
2012-05-07 22:37:18 +00:00
bf8b3b0696
Forgot to set token variable
2012-05-07 12:36:29 -04:00
e0a5f976e7
Fix bug oc-542, encode urls for private links
2012-05-07 11:30:36 -04:00
71423ec566
Fix bug oc-402, check if token is set for a private link
2012-05-07 10:47:55 -04:00
b9033d3b78
Only load sharing statuses if in files app
2012-05-07 10:47:55 -04:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
2d581c675f
Audit: Log sharing actions
2012-05-07 09:04:07 +02:00
471cad7d90
Remove manual file cache insertions of shared files, update mtime of shared folder
2012-05-06 20:14:29 -04:00
41179a1456
Fix feedback for sharing errors
2012-05-06 19:06:24 -04:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
565e02d061
Add back removed groups to the select form correctly
2012-05-05 17:10:07 -04:00
ef9511c713
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls
2012-05-05 15:18:14 -04:00
d764585d8b
Remove blind effect for email private link in drop down
2012-05-05 14:57:25 -04:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
80dff77b65
Fix private links
2012-05-02 19:24:43 -04:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8ed8d9cd91
fixing namespace
2012-05-02 00:55:26 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
ab58471904
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-01 20:07:36 +02:00
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
20f3875f1b
Change default from address to sharing-noreply@server for emailing private links
2012-05-01 13:06:17 -04:00
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
7eb7492360
some fixes for sharing
2012-04-27 23:14:53 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
5c55b9c5ac
Sharing: Add a filename after public share link
...
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
e76e4e7540
add touch() to all storage backands, and make parameter optional
2012-02-29 23:44:05 +01:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
0af31a5328
missed one is_writeable
2012-02-26 03:56:45 +01:00
c8c3b8a63e
chunked implementation for readfile
...
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
88b2391d2b
Fix wrong var name in sharedstorage.php
2012-02-08 21:12:31 +01:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
0124809a42
prevent sharing from making aditional http requests while scanning
...
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
e0f655fb70
Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113
2012-01-30 16:49:24 -05:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
de16537231
Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file
2012-01-16 20:16:32 -05:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
64a24191a3
Fix return for empty Shared folder in opendir()
2012-01-01 14:04:16 -05:00
9e50cecf27
Fix shared status for files inside a shared folder
2011-12-17 21:13:54 -05:00
65214bed0c
make the sharing app return the corrrect result for is_writable on the shared folder
2011-12-16 17:31:31 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
7454af0c79
apps files_sharing - fix in share.js to check the "can edit" checkbox -
...
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
82f30c709c
apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
...
to enable other user backend
2011-11-18 14:05:38 +01:00
a70c2b3cb9
apps file_sharing
...
changed
$RUNTIME_NOAPPS = true;
to
$RUNTIME_NOAPPS = false;
in ajax/userautocomplete.php - to fetch users also from different user
backends - not only database backend
2011-11-18 14:05:37 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
cc35cb74e1
Try to avoid closing the share box too soon on multiple selections
2011-11-06 15:29:51 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
2906ea3d78
Add caching for filelist sharing icon status to avoid many http req.
2011-10-20 23:03:05 +02:00
29368d1c58
Add 3 More log writing in files sharing app
2011-10-18 21:30:08 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
2ac00b378a
Fix file sharing : Don't give a unused param to execute
2011-10-17 23:39:23 +02:00
ae56bb63c6
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
2011-10-06 22:36:34 +02:00
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
0cde2a3146
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
2011-10-05 14:27:50 +04:00
bdcf31cc73
Added translatable text.
2011-10-02 16:06:30 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +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
f4ecf47e61
Fixed delete cross positioning issue.
2011-09-27 05:26:49 +10: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
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
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
8c8490b28e
Show users shared with in the drop down for reshared files
2011-08-24 18:41:36 -04:00
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
4c4b1e4c2d
Clear the folder size cache for the 'Shared' folder when a new item is shared
2011-08-24 11:59:03 -04:00
96ad8a15b4
Register OC_Share for autoloading and cleanup hooks
2011-08-22 12:37:44 -04:00
c72187474a
Check that the files exist before adding them to the fakedirs
2011-08-22 12:00:56 -04:00
1b64b7395c
Update documentation for unshareFromMySelf()
2011-08-22 11:31:47 -04:00
0eda75a193
One more bug fix in clearFolderSizeCache()
2011-08-20 15:48:48 -04:00
f10f916f8c
Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes
2011-08-20 15:43:18 -04:00
ceae4fa7b4
Fix bugs preventing file upload in shared folders with write permission
2011-08-20 12:36:20 -04:00
6afc17be1a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-20 12:03:22 -04:00
631152fc3e
Implement searching of files shared with you
2011-08-20 12:03:03 -04:00
d15673f13f
removed single quotes around publicly linked download file
2011-08-20 17:44:28 +02:00
add0a90e1e
single quotes in JavaScript & PHP, double quotes in HTML
2011-08-20 05:56:04 +02:00
c2f0fe51c4
Add getLocalFile() to OC_Filestorage_Shared
2011-08-19 20:05:57 -04:00
778b8543c1
Remove no longer needed functions in OC_Filestorage_Shared
2011-08-19 20:04:35 -04:00
ca86093270
Full support for viewing public links from sharing drop down
2011-08-19 12:47:00 -04:00
a57d4726bc
Remove some scripts, now you can actually download the files in a public link folder
2011-08-18 19:44:00 -04:00
d1aebcddf2
Add downloadURL to files templates for both public links and files
2011-08-18 19:32:24 -04:00
498356fcb8
Copy get.php into files_sharing, public links now use files templates
2011-08-18 15:35:31 -04:00
594532da9a
Merge public link icon check
2011-08-18 13:14:06 -04:00
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
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
4078e0a242
-1 is now a class constant (UNSHARED), for unsharing files from self
2011-08-17 18:00:37 -04:00
1303e40b6e
Remove navigation entry for shared files
2011-08-17 17:44:10 -04:00
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
1c13b2681a
Fix my last commit 9ee4fc
2011-08-17 14:22:14 -04:00
9ee4fcdf2f
Only show 'Shared' directory if files are shared with you
2011-08-17 13:47:10 -04:00
5925697374
Fix bug in getPermissions() and clean-up unlink() and rename()
2011-08-17 12:58:09 -04:00
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
0edce1796b
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-16 20:21:57 -04:00
582dca4d91
Initial merging of files_sharing and files_publiclink
2011-08-16 20:21:18 -04:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
717ab56419
Display public icon next to publicly shared files
2011-08-16 12:18:31 -04:00
726933831d
Public link folder uploading not implemented, comment out checkbox for it in dropdown
2011-08-16 12:06:08 -04:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
5b09aef166
Additional user group sharing support and more clean-up in the constructor
2011-08-15 17:37:16 -04:00
5cb687d168
Refactor getUserAndGroups() for new user group sharing standard - user@group
2011-08-14 12:16:14 -04:00
e1473cfe83
Change OC_GROUP to OC_Group
2011-08-14 11:44:37 -04:00
3c517499bb
OC_Share constructor refactored for user group sharing
2011-08-12 20:49:44 -04:00
497789cdd8
Clean up constructor for OC_Share, add some error handling for sharing files
2011-08-12 17:22:32 -04:00
a8e6be6016
Change the share file action icon if the file is already shared with someone
2011-08-12 11:34:17 -04:00
9e35d5a886
Remove hardcoded http:// when generating public links
2011-08-11 16:56:09 -04:00
c65046773d
Make unshare work from dropdown
2011-08-11 14:20:50 -04:00
6d25943f2f
Fix some areas on dropdown triggering the dropdown to hide
2011-08-11 12:50:29 -04:00
0ad0ed77c5
Hide the dropdown if you click the share file action button
2011-08-11 12:03:48 -04:00
0f91438b80
Don't spawn a new dropdown if there is already one open
2011-08-11 11:52:10 -04:00
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
103d23b3a3
Refactoring in dropdown javascript
2011-08-11 11:09:14 -04:00
568fd0df83
changed quotes
2011-08-11 13:53:25 +02:00
511c193631
only load share action when in file browser
2011-08-11 13:33:43 +02:00
80660bdc07
Fix shared list for files inside of shared folders
2011-08-10 13:38:58 -04:00
88e338ec23
Only show can edit (if not checked) and unshare button on hover
2011-08-09 17:55:51 -04:00
7c840e9bbb
Remove users and groups from the select form that have already been shared with
2011-08-09 11:00:14 -04:00
c654442901
No more subnavigation entries, fixing 'Shared'
2011-08-09 10:45:12 -04:00
cdf2dbcd52
Use chosen select form for selecting users in sharing drop down
2011-08-09 10:34:00 -04:00
23c8d7b3fb
Show which parent folder is shared with the user in the sharing drop down
2011-08-08 15:49:16 -04:00
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
843f8aca7c
Full support for making and deleting public links from share dropdown
2011-08-05 11:18:35 -04:00
8f01abf054
Share dropdown updates, making public links now works
2011-08-03 15:21:53 -04:00
96ab35a331
Animate appearance of share drop down
2011-08-02 15:23:17 -04:00
d0b2a3b1ac
moved dialog css to sharing, fixed position
2011-08-02 19:30:18 +02:00
d71cca0e81
first style for sharing dropdown, some html fixes
2011-08-02 18:58:33 +02:00
0d79560e94
New implementation of share dialog
2011-08-02 12:19:49 -04:00
ddfc9fc001
Move registering shared storage out of base
2011-08-01 10:58:15 -04:00
57ca70e27c
Add support for assigning permissions in share dialog and switch to post
2011-07-31 20:47:53 -04:00
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
c185743ae9
Update the folder sizes for shared folders
2011-07-31 14:48:23 -04:00
f88c4b1f48
Human readable permissions in shared files list
2011-07-31 13:15:07 -04:00
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
d13ba0ee2d
Revise permissions system to support read, write, and delete
2011-07-30 16:03:32 -04:00
09e05d14a0
im in ur branch, fixin teh details
2011-07-30 14:40:10 +02:00
f0c1f38f98
Add share action for mutliple selected files
2011-07-29 15:43:29 -04:00
45222f34a6
Make 'Share' a subnavigation entry of of 'Files'
2011-07-29 12:20:01 -04:00
1fc41a7bfc
Integrate sharing app with the new interface
2011-07-29 12:11:53 -04:00
67fe835f03
Add a function for removing any duplicate or trailing '/' from the paths
2011-07-28 20:28:22 -04:00
7e3b796de8
More elegant solution for preparing IN ?s, thanks icewind
2011-07-28 20:05:18 -04:00
5bc0619234
Add support for sharing files with user groups
2011-07-28 19:42:02 -04:00
31a067b5a3
Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE
2011-07-28 15:31:52 -04:00
d36850f0f2
Close sharing dialog box on share success
2011-07-27 19:52:10 -04:00
64b5332f33
Make file sharing dialog work - only works for one file/folder and user
2011-07-27 19:25:33 -04:00
1ec0b6ecc1
jQuery dialog for sharing files from within file browser - Not functional yet
2011-07-26 21:27:40 -04:00
5148eb9121
Include groups in user autocomplete
2011-07-24 16:07:39 -04:00
4282a42b3f
Add support for user autocomplete
2011-07-24 15:47:37 -04:00
17b5bcb24f
Bug fixes for unshare() and opendir(), thanks darkh
2011-07-24 14:38:01 -04:00
4993fb4665
Filter out files you unshare from yourself in opendir()
2011-07-23 14:41:01 -04:00
e6e673d7c0
Use SUBSTR instead of LIKE in queries, should now work with SQLite
2011-07-22 20:41:16 -04:00
302527c2d6
Remove shared items check, it prevents sharing items if there aren't already any.
2011-07-21 14:53:51 -04:00
4abefde290
Remove admin page, administration is not needed at this time for sharing
2011-07-20 16:54:06 -04:00
6af4c465b8
Change all occurences of ['user_id'] to OC_USER::getUser()
2011-07-20 16:52:01 -04:00
fcda3a338c
Fix bug in constructor for appending numbers to already existing targets
2011-07-20 16:41:39 -04:00
3e6037659e
Change permissions to is_writeable
2011-07-20 15:42:49 -04:00
22f8415045
Remove accidental kate swap file
2011-07-20 14:46:01 -04:00
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
c9082d5b0d
Append number to name if target file already exists
2011-07-20 14:16:20 -04:00
029b21bf54
First implementation of sharing user interface
2011-07-20 13:34:16 -04:00
61837428ba
Add post_delete and post_rename hooks and fix the constructor
2011-07-18 16:36:34 -04:00
1a6718c979
Add extra check for opendir() so it only adds the file to fakedirs if it has a different name than the source
2011-07-16 15:15:18 -04:00
f3f8a96c6d
Add return true to unlink() and rename(), a return is expected by OC_FILESYSTEM
2011-07-16 14:58:12 -04:00
5aaacf3241
Fix bug in rename() so files in a folder that is in a shared folder also get their targets updated
2011-07-16 14:29:22 -04:00
dbcb35655e
Fix bugs in opendir() and add extra checks to ensure functionality in all cases
2011-07-16 14:24:59 -04:00
8ad4a44171
Fix bugs in unlink(), rename(), pullOutOfFolders(), and getItemsInFolder()
2011-07-16 13:06:59 -04:00
8ed0223bd6
Add pullOutOfFolder() function for use by unlink() and rename()
2011-07-14 21:04:09 -04:00
7920e706ea
Refactoring of OC_SHARE, added more documentation for functions
2011-07-14 19:24:48 -04:00
2fb1481613
Bug fix for setTarget() - append fetchAll() to query
2011-07-14 12:40:12 -04:00
24e24f1b65
Add support for copying files between shared folders, add check to fromTmpFile() to confirm path is writeable
2011-07-13 15:27:16 -04:00
d393ccfe2c
Fix bug in getSource(), return false if target isn't in database
2011-07-12 20:18:08 -04:00
b2b7d99302
Add checks in opendir() to prevent including the current directory or parent
2011-07-12 18:22:59 -04:00
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
163c490c92
Remove duplicate '/' from target when searching for source
2011-07-10 14:41:27 -04:00
010920ad08
Add support for files inside of shared folders having different names than the source file
2011-07-08 18:21:20 -04:00
73bab46758
Prevent searching for user directory in getParentFolders()
2011-07-08 15:23:41 -04:00
f1cac00396
Add wildcard to source for database query in unshare()
2011-07-08 15:03:05 -04:00
d91d2178b8
Fix unshare() to remove database entries of files within a shared folder
2011-07-08 14:58:35 -04:00
35d6051e9d
Fix bug in mkdir(), was passing the wrong path
2011-07-07 19:26:25 -04:00
b7c45ba240
mkdir() now checks isWriteable() to see if it has permission, rmdir unshares the folder from the user
2011-07-07 19:22:23 -04:00
58e8312b1c
Fix setIsWriteable() and setTarget()
2011-07-07 18:25:34 -04:00
2212b5b5d7
Add wildcard to database query in unshareFromSelf()
2011-07-06 20:16:29 -04:00
2908145b94
Fix bug in is_writeable(), was passing the wrong path
2011-07-06 15:28:50 -04:00
732ad7f6c1
Add support for renaming, moving, and deleting shared files
2011-07-06 15:17:03 -04:00
cf33995892
Refactor OC_SHARE to allow for renaming and write permissions
2011-07-06 12:12:29 -04:00
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
e24e2d0e16
Append LIMIT 1 to getSource queries to improve performance
2011-07-03 11:43:49 -04:00
b03083b881
Fix check for parentDir and fix the return for a nonexistent target in the database
2011-06-27 18:14:04 -04:00
053edde780
Improvements to caching for shared folders
2011-06-27 12:53:10 -04:00
a402c8ffe1
Implement caching for source paths in OC_FILESTORAGE_SHARED
2011-06-27 11:47:36 -04:00
fe178310f3
Use php functions dirname() and basename() instead of manipulating strings in getSource()
2011-06-26 19:21:24 -04:00
12c168b6dd
Add function setTarget(), implement recursion in getSource() for folders
2011-06-25 22:00:52 -04:00
78293ea244
Better implementation of getting shared folder size by using the source path
2011-06-24 19:52:35 -04:00
c8781b1caf
Add error handling for getSource()
2011-06-24 19:38:39 -04:00
e91f42d249
Add support for sharing folders
2011-06-24 19:20:08 -04:00
8cbee28416
Better implementation of filesize for shared directory, now storing in oc_foldersize
2011-06-22 21:05:31 -04:00
87097db4eb
Changed self:: and OC_FILESTORAGE_SHARED to ->
2011-06-22 19:47:57 -04:00
e3ea84d048
Changed ctime for the shared folder to the earliest ctime
2011-06-22 19:17:31 -04:00
3f5fde50c1
Forgot to remove TODOs for file?time()s
2011-06-22 18:22:48 -04:00
098fc5ef95
Fixed stat(), file?time()'s now grab most recent time from shared files
2011-06-22 18:16:41 -04:00
ac0d41418e
Correct calculation for shared folder size
2011-06-22 17:55:07 -04:00
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
4e7d1c376f
OC_FILESTOAGE_SHARED now works with hard coded values for files
2011-06-18 13:49:52 -04:00
69b5e01be1
OC_FILESTOAGE_SHARED updates + its own getInternalPath()
2011-06-18 13:29:16 -04:00
e6621b9c78
Added source and target to database fields
2011-06-16 15:54:25 -04:00
fe4a213e1b
Fixed mistakes pointed out by icewind
2011-06-16 14:59:54 -04:00
bf66563cda
First version of shared storage provider - not functional
2011-06-16 14:40:21 -04:00
8603b0973f
Initial setup of sharing app
2011-06-11 16:14:24 -04:00
Jenkins for ownCloud
Michael Gapczynski
Bart Visscher
Jörn Friedrich Dreyer
jfd
Robin Appelman
Lukas Reschke
Arthur Schiwon
Thomas Tanghus
Bjoern Schiessle
Michael Gapczynski
Sam Tuke
Marco B
Frank Karlitschek
Brice Maron
Georg Ehrke
Jan-Christoph Borchardt
Marvin Thomas Rabe
Robin Appelman
krzaczek
Borjan Tchakaloff
Scott Barnett
Florian Pritz
Bart Visscher
Jan-Christoph Borchardt