afa8872955
Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
...
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
7776e088d6
Group sharing activities by user/group and file respectively
2015-03-20 09:49:33 +01:00
5f7b3a4dbe
Rename must be possible with update-only permission
...
and this as long as the rename is done within the same folder.
2015-03-19 21:55:56 +01:00
be6edd465a
Merge pull request #14537 from owncloud/oci-external-share
...
Fix external shares without password on oracle
2015-03-19 16:20:12 +01:00
c2315aa015
Fix shared storage permission checks
2015-03-18 19:56:31 +01:00
8ebb198ef3
Add a unit test for the naming conflict on the mountpoint name
2015-03-17 16:55:03 +01:00
ba3e4ede39
Use insertIfNotExists() instead of manual logic
2015-03-17 16:03:24 +01:00
05c4848954
Correctly get the unique mountpoint name when mounting the share
...
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
2015-03-17 16:03:24 +01:00
db033e4e19
Fix PHPDoc and Co.
...
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
2015-03-17 10:37:09 +01:00
b9d9405135
Fix scanFile signature warnings
2015-03-16 16:45:11 +01:00
47af533183
Move mimetype check from template to controller
2015-03-16 12:45:18 +01:00
e9a003fe21
Slight better formatting
2015-03-11 15:11:50 +01:00
09ee297356
New array syntax
2015-03-11 15:02:55 +01:00
c985186246
Added new header
2015-03-11 15:02:55 +01:00
af76716775
Now added enabled element
...
This change allows for more generic parsing for the capabilities.
2015-03-11 15:02:55 +01:00
39b0f0725e
Add file_sharing info to capabilities
...
Display the capabilities regarding file sharing in the capabilities API.
This will allow the clients to provide users a better experince.
2015-03-11 15:02:55 +01:00
6a677ce8fe
Do not make setupMounts() public just because of testing
2015-03-11 11:10:43 +01:00
dcd2d7aff5
Add unit tests for external share mananger
2015-03-10 10:17:53 +01:00
48243a2949
Allow iframes from same domain in share view
...
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.
Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.
Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
2015-03-10 10:06:15 +01:00
4322287fc3
Fix size propagation over shared storage boundary
2015-03-05 22:23:47 +01:00
c65c717379
Fix external shares without password on oracle
2015-02-27 13:22:57 +01:00
f72f9e0159
Merge pull request #14530 from owncloud/revert-14403
...
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
5bb0889b30
Remove uneeded assignment
...
'files' is neither used in the controller or the template
2015-02-24 19:50:23 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
837365fff2
Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
...
Activity/225 sharing extension
2015-02-18 14:46:58 +01:00
0833a6e332
Correctly create activities for public downloads
2015-02-17 17:26:03 +01:00
b768a70616
Use filterNotificationTypes to filter the types and group the methods
2015-02-13 11:30:36 +01:00
9ccfbc14f6
Copy sharing related activity code to Files_Sharing activity extension
2015-02-13 11:16:43 +01:00
1bb6de7c1b
Merge pull request #13425 from owncloud/phpdoc_cleanup
...
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
a67627140c
Revert "Add OCS sharing info to capabilities"
2015-02-07 00:12:26 +01:00
3be3e20c0f
Bit better formatting when using json output
2015-02-06 10:55:33 +01:00
d4e361db44
Updated sharing capabilities
...
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
2015-02-06 10:33:08 +01:00
0452fde212
Converted getCapabilities to non static function
2015-02-04 14:56:31 +01:00
4801d9c02a
Use single quotes
2015-02-04 14:56:31 +01:00
ea1f726b7d
Only return capabilities if they are set
2015-02-04 14:56:31 +01:00
b3ea849a87
Added capabilities whether a server allows public links
...
This fixes #13673 .
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
2015-02-04 14:56:31 +01:00
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00
bd888748bd
Merge pull request #13490 from owncloud/fix_reshare_s2s_share
...
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
66f0db30b2
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
2015-01-26 16:54:50 +01:00
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
f6e644b43f
Catch storage exception in scanner for remote shares
...
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.
Also, getDirectoryContent() will now skip unavailable storages.
2015-01-26 13:59:49 +01:00
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01:00
7216983a08
delete all server-to-server shares if a user gets deleted
2015-01-21 17:11:34 +01:00
8ba42abbe4
Merge pull request #13432 from owncloud/animate_gifs_public_sharing
...
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
9fbdd1072e
Fix webdav mkdir for remote shares
2015-01-21 15:14:57 +01:00
87a754c72e
avoid $this->cache being null - fixes #13491
2015-01-20 12:38:54 +01:00
374ddbff55
show animated gifs on public sharing page
2015-01-19 16:20:06 +01:00
2b99fc76ec
Cleanup of PHPDoc return types
2015-01-16 20:30:43 +00:00
9b7c1a0093
Merge pull request #13347 from owncloud/share-scanpermissionsfromsource
...
Use source storage permissions when scanning shared storage
2015-01-15 11:15:15 +01:00
9d0915013b
Merge pull request #13352 from owncloud/hhvm-array-key
...
HHVM: Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 01:06:45 +00:00
b4a52e889a
Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 00:48:10 +01:00
a9f0582e3e
Use source storage permissions when scanning shared storage
2015-01-14 18:11:23 +01:00
25806346c2
remove deprecated code - fixes #13119
2015-01-14 13:56:49 +01:00
d50e70ba3a
set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table
2015-01-13 17:24:00 +01:00
01c83158bb
Fix source path when share is a mount point
...
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.
This fix removes the bogus leading slash in such situation.
2015-01-08 11:46:11 +01:00
70dcebbf92
Correctly return false when translating a foreign activity
2015-01-07 15:02:25 +01:00
8c48be453e
only send activity if we have a valid path and the file is readable
2014-12-23 13:32:54 +01:00
3afcc71764
Make sure the path passed to the activity manager is normalized
2014-12-22 18:50:00 +01:00
393deb5961
add activity if public shared file/folder was downloaded
2014-12-22 18:50:00 +01:00
510488ad3e
Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
...
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
11b3aa2dbe
Fix issues with searchByTag in shared storage
2014-12-18 17:27:56 +01:00
e656af4c83
Root always exists
2014-12-17 16:09:41 +01:00
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
46def69574
Specify list of activity parameters for sharing extension
2014-12-12 11:41:01 +01:00
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
3026cdbc80
Merge pull request #12549 from owncloud/shared-cache-non-existing
...
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
ce10b93519
Dont return cached date in shared cache when the file doesn't exist
2014-12-02 15:28:11 +01:00
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
e6a7022037
Merge pull request #12410 from owncloud/no_session_for_public_share_key
...
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
1d33503487
we no longer need to keep the session open for encryption
2014-11-25 13:37:11 +01:00
6fb2477fb7
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
...
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
8589079590
Close session only if encryption app is not enabled
...
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
a6ebb17610
Remove unused variable and make Scrutinizer happy.
2014-11-18 18:52:00 +01:00
f3ab4f3faf
Don't disclose relative directory path for single shared files of user
...
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.
However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)
This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
2014-11-18 18:51:57 +01:00
1b85f40cbe
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
...
This feature only exists on master.
2014-11-18 17:14:26 +01:00
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
fad621140b
Added download size on public sharing
2014-11-14 16:26:59 +01:00
988c85d292
Refactor file sharing public link handling
...
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
7ecd220715
Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user
2014-11-06 18:31:40 +01:00
ee6d8c9d58
Store curl error message directly
2014-11-04 17:37:15 +01:00
768f3979e0
Check for cert bundle existence before using it
2014-11-04 16:44:42 +01:00
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
f44e617dfd
Fix warning with unset extension check
2014-10-29 12:56:49 +01:00
4438c7de1d
Fix shared cache getFolderContents
2014-10-24 12:32:55 +02:00
6ed9f53fcd
also update shared watcher
2014-10-24 12:32:55 +02:00
527e1d001f
try to get path from filesystem
2014-10-10 14:47:41 +02:00
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
e5f0dded84
throw a exception if we can't handle the provided path
2014-09-29 11:13:06 +02:00
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
298011bf29
fix indention
2014-08-31 10:45:11 +02:00
c2ebc192a6
Make external shares work with imported self-signed certificates
2014-08-31 10:45:11 +02:00
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
58ab105515
Merge pull request #10421 from owncloud/share-external-delete
...
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
c9903f2e68
make share folder configurable
2014-08-18 16:52:48 +02:00
bbe17f35a1
Remove no longer existing files from the cache when scanning external storage
2014-08-14 14:50:52 +02:00
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
a7b4cd77b1
traverse folders in php to search in shared files
2014-07-31 12:05:29 +02:00
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
b7958f79c3
adjust error code
2014-07-28 12:39:22 +02:00
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
97de7bb23e
Fix remote share when remote server is installed at the root
2014-07-23 13:45:56 +02:00
658828867c
Correctly return the owner display name for children of shares
2014-07-16 12:07:02 +02:00
f4f52cf242
Fix update cleanup to only affect file and folders
...
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
2014-07-08 14:53:31 +02:00
a544bd3a0f
Merge pull request #9357 from owncloud/sharing_unshare_on_delete
...
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
5e8959a5b3
Return and use isPreviewAvailable for share previews
...
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 11:16:23 +02:00
3b9fa81581
if a folder gets deleted we unshare all shared files/folders below
2014-07-04 10:34:54 +02:00
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
615d037d3e
Merge pull request #9364 from owncloud/sharing_rename_mount_points
...
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
f4eb90e229
Merge pull request #9311 from owncloud/storage-not-available
...
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
ea31ab7b5c
rename mount point of children if parent was renamed
2014-07-02 15:39:38 +02:00
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
8061a4ccc0
Remove external shares if the share is invalid
2014-07-01 14:58:07 +02:00
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
abc521dbf7
add missing backticks
2014-07-01 12:29:30 +02:00
372d58544f
no longer check if the external storage app is enabled, we use no the webdav implementation from core
2014-06-30 12:34:49 +02:00
1bb1504d24
Improve comment
2014-06-27 17:31:51 +02:00
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
93a6792da7
Merge pull request #9205 from owncloud/remoteshare-fixurlpath
...
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
38ff8173ab
make sure that hooks are registered for the tests
2014-06-25 15:20:52 +02:00
d22559200c
Fix parsing of remote URL when mounting remote shares
...
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud ".
Such URLs are now parsed correctly.
Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
9b001ed903
Setup the external share manager in a hook
...
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
2014-06-23 11:57:43 +02:00
3ed4e5b26b
Prevent warning
2014-06-16 16:12:32 +02:00
9c2918a626
Fix setupFromToken when a password is set
2014-06-16 16:09:56 +02:00
0616eb4007
Fix multiple users having the same external share mountpoint
2014-06-16 15:57:01 +02:00
9670d3e98b
Always send a POST body
2014-06-14 10:22:38 +02:00
455fbafb48
Fix undefined index error
2014-06-14 10:22:38 +02:00
3bf7b54cd5
block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core
2014-06-14 10:22:38 +02:00
84a651e46d
add settings to disable server to server sharing
2014-06-14 10:22:38 +02:00
e7b58ed2bd
Properly expose read only public shares as read only
2014-06-14 10:14:08 +02:00
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
decb51aee6
Fix deleting of external shares
2014-06-14 10:14:08 +02:00
c8c8106168
generate better storage ids
2014-06-14 10:14:08 +02:00
ce0aa7d4a8
Use the movable mount system for external shares
2014-06-14 10:14:08 +02:00
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
64ced76beb
Save mountpoints relative to the user
2014-06-14 10:14:07 +02:00
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
87b0021e56
Scan the entire remote share at once by requesting the full file tree from the remote server
2014-06-14 10:14:07 +02:00
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
a978607011
Use &=
2014-06-09 12:47:00 +02:00
0b2ae314c7
check if permissions exists
2014-06-06 09:56:02 +02:00
60ea4388ed
Limit permissions to share permissions
2014-06-06 09:56:02 +02:00
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
574de2d91b
the mount point always have delete permissions to allow unmount
2014-06-06 09:56:01 +02:00
ad5d8d7980
nake sure ti create new db entry when user renames a group share
2014-06-06 09:56:01 +02:00
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
9a48e87253
make sure that we have a path relative to data/user/files to work with
2014-06-06 09:56:00 +02:00
0ce07bb6c4
update mount point if file_target changed
2014-06-06 09:56:00 +02:00
844b1e3fc6
add additional unit tests
2014-06-06 09:56:00 +02:00
24f3f6823e
get unique_name value directly from the share array
2014-06-06 09:56:00 +02:00
5132ae5e69
fix mount point move up if the parent no longer exists
2014-06-06 09:56:00 +02:00
884b9a0ecf
bring back updateFileTarget() got lost during last rebase
2014-06-06 09:56:00 +02:00
1b0b977678
remove share mount
2014-06-06 09:55:59 +02:00
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
14ce44acc8
Move shared mount moving from the storage to the mount
2014-06-06 09:55:59 +02:00
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
916f859377
check if it is a share storage
2014-06-02 20:39:20 +02:00
2a10e78c58
no need to empty array in a special way
2014-06-02 20:17:40 +02:00
e0a5f3b570
get permissions directly from share storage to avoid additional db calls
2014-06-02 20:17:40 +02:00
37afab87b5
minimal mail template editor for administrators, refs #7177
2014-06-02 19:22:58 +02:00
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
11aa2cf74b
always check for unique filename, if a file gets added from outside the mount
...
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
55fc693750
@breif -> @brief
2014-05-13 19:09:15 +01:00
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
28f0e6307f
Fix sharing of ext storage mount points
...
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
2014-05-08 10:03:07 +02:00
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
f85e968883
Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup
2014-05-07 17:57:32 +02:00
d3f957c21e
remove error_log output
2014-05-07 17:56:52 +02:00
dbb93074b3
Fix endless loop on windows servers
...
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
2014-05-07 17:38:29 +02:00
31bf2d4b33
we can take the permission directly from the share, no need to call the share api first
2014-05-07 16:49:07 +02:00
799d8ca381
check if we have a fileinfo
2014-05-07 11:47:52 +02:00
bee48f851e
ignore part files
2014-05-07 11:47:27 +02:00
bf681713c8
Merge pull request #8415 from owncloud/sharing_fix_rename
...
[sharing] return the new name if a mount point was renamed
2014-05-01 14:58:29 -04:00
33883a46f5
return the new name if a mount point was renamed
2014-04-30 20:29:21 +02:00
20e4ad382b
get the correct owner path for part files
2014-04-30 12:49:16 +02:00
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
7ac7546b71
Merge pull request #8353 from owncloud/publicshare-webdav
...
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
b176708505
Expose public shares over webdav
2014-04-25 14:45:18 +02:00
b42418246f
Also fixed the returned internal path when getting the root shared item by id
2014-04-25 14:04:22 +02:00
c53c4b9791
fix search by mime for shared single files
2014-04-25 12:28:10 +02:00
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
dd1e47b3b8
typos, use, unused and return fixed
2014-04-23 12:54:26 +02:00
2049bedcaf
Dont throw an error when a storage isn't found for shared cache
2014-04-23 12:54:26 +02:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
b712393e72
fix etag propagation
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
3f6e9e0102
cleanup the shared storage, always keep the whole share resource
2014-04-23 12:54:25 +02:00
c9bd2f7a6c
also fetch the etag from file cache
2014-04-23 12:54:25 +02:00
d4085d8148
make sure that path is not 'false'
2014-04-23 12:54:25 +02:00
33cdd93890
fix deleting of shared files
2014-04-23 12:54:25 +02:00
bfabd247f4
fix updating of shared files
2014-04-23 12:54:25 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
4967435237
show "shared by ..." for share mount point
2014-04-23 12:54:25 +02:00
6b19482f3e
generate unique target name
2014-04-23 12:54:25 +02:00
6d87dacad4
fix getMimeType call, we always need to check the source path
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
b02b6d3c23
no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache
2014-04-23 12:54:24 +02:00
c377893f0e
make sure that we have the right permissions for the mount points
2014-04-23 12:54:24 +02:00
a27db9e4ca
first steps to remove the shared folder:
...
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
2014-04-23 12:54:24 +02:00
999e74e834
Fix PHPdoc in apps/files_sharing
...
using scrutinizer patch
2014-04-15 21:05:44 +02:00
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
27eff1ac30
Merge pull request #7293 from owncloud/update-shares-postgres
...
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
206364cd1c
remove invalid shares with one SQL statement
2014-03-13 13:09:32 +01:00
ec54bc7709
Refactor update script to class and add unit test
2014-03-13 13:09:32 +01:00
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
a09df0083e
add 'received_from' info to the share, so that every share can have a different value
2014-03-11 12:59:37 +01:00
9548670da7
we need the file_source to delete a share successfully
2014-03-10 11:35:54 +01:00
15d1df055b
Merge branch 'master' into display-share-owner-master
...
Conflicts:
apps/files_sharing/lib/cache.php
2014-02-28 14:54:10 +01:00
da386aad59
Allow re-using already known fileinfo when calculating folder sizes
2014-02-28 14:23:07 +01:00
3be5e48b0c
only add "received_from" if a share was found
2014-02-26 12:52:35 +01:00
6ca4d3bfde
fix usersPath and add unit tests
2014-02-21 13:37:46 +01:00
179fbada32
show share owner within shared folders as well
2014-02-20 18:24:42 +01:00
7c68025010
adding share owner information to the file list
2014-02-20 18:24:42 +01:00
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
fa5ddc3e18
Fixed searchByMime in shared cache
...
- searchByMime now correctly returns files recursively search through
all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
f9d9a62e58
remove needless element tag
2014-01-30 13:34:41 +01:00
cd4e044f66
public upload is also possible with encryption enabled, since OC6
2014-01-28 17:28:20 +01:00
7f83f2a8f2
use more accurate error codes
2014-01-28 13:31:43 +01:00
eaed786eed
add path relative to the files folder of the currently logged in user to the output of getFolderContent()
2014-01-22 17:11:37 +01:00
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
89eb3759a8
Fixed sharing results to include the correct permissions
...
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.
Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.
Fixes #6265
2013-12-09 18:14:58 +01:00
ace1d40ed6
get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
2013-12-05 17:25:01 +01:00
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
d2840a045d
Fixed sharing hook to not remove the share before the trashbin
...
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
a2015ee065
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-11 17:58:20 +01:00
9f4fd0161e
Added unit tests for shared files watcher
...
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
propagation
2013-11-05 19:30:52 +01:00
eb6fc14f84
Removed unused method
2013-11-05 17:14:19 +01:00
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
a7cb16aab1
use ===
2013-11-04 21:23:10 +01:00
fdaac99526
Merge pull request #5626 from owncloud/fix_search_in_shared_files
...
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 09:02:39 -07:00
68e88b6e40
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 15:48:38 +01:00
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
f91a4c89ca
adding storage_mtime handling to SharedCache
2013-10-25 12:39:21 +02:00
2221aa9ca4
run first getUsersItemShared() with the owner
2013-10-23 16:34:26 +02:00
60e219da43
update etags for user we haven't checked yet
2013-10-23 16:34:03 +02:00
6ae761d946
keep a list of users we already checked to avoid loops
2013-10-23 16:33:44 +02:00
dd972f65a8
fix infinite loop while updating etags, fix for #4365
2013-10-23 16:33:28 +02:00
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
48cd9d9444
filter duplicates directly in the sql query
2013-10-18 10:23:34 +02:00
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
ab6ee79e11
adjust tests
2013-10-17 11:23:07 +02:00
abf10ac9bd
new option to add reshares to the result
2013-10-17 11:10:31 +02:00
3dd313dca2
add "received_from" and "received_from_displayname" field in case of a reshared file to the output
2013-10-10 19:46:45 +02:00
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
401740166b
add comments
2013-10-04 16:50:53 +02:00
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
aa660a3475
remove deleted shares from the database table oc_share
2013-10-02 13:26:38 +02:00
513dc20d4b
also return success if no shares are found.
2013-09-30 13:05:34 +02:00
63ea6844e8
- adding unit test testGetShareFromUnknownId()
...
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
b9d6539d76
Merge branch 'master' into ocs_share_api
2013-09-26 13:02:39 +02:00
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
259f03bee2
remove debug output
2013-09-23 14:10:09 +02:00
6aeb0a99da
same for search by mime
2013-09-19 21:08:32 +03:00
3b4020e811
add all results, sharing cache also returns entries for shared files in external storages
2013-09-19 21:08:32 +03:00
466fd8acda
fix getAll(), refactor search by mime & search
2013-09-19 21:08:32 +03:00
392c6b6832
return fixed path, skip shared files outside of 'files'
2013-09-19 21:08:32 +03:00
27511d9187
divide ids into chunks of 1k
2013-09-19 21:08:32 +03:00
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
39920955f2
set share id to 'unknown' if we can't retrive one
2013-09-19 16:52:44 +02:00
c9f1538c1f
extend API to get the shares from all files in a given folder
2013-09-19 16:41:29 +02:00
b947aab802
some unit test for the new ocs share api
2013-09-19 14:39:51 +02:00
199121134f
return error if wrong shareType is given
2013-09-19 10:33:04 +02:00
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
e52639e4e6
use share ID as REST resource
2013-09-17 15:27:46 +02:00
86dbb13823
more rest-style API
2013-09-17 11:53:38 +02:00
ef3307f099
return error if public upload is disabled
2013-09-16 17:42:56 +02:00
7aed24fa6c
allow to set a different permission during initial share operation
2013-09-16 17:28:17 +02:00
14437ffd15
ocs api for file sharing
2013-09-16 17:04:49 +02:00
3861c9bce1
some more OCS calls for sharing
2013-09-06 16:00:01 +02:00
b6ee727399
intermediate result ocs api
2013-09-06 10:49:21 +02:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
21a0a96e43
intermediate results, share api
2013-09-04 17:25:15 +02:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
5a47054505
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
2013-05-29 18:22:54 -04:00
Thomas Müller
Joas Schilling
Vincent Petry
Robin Appelman
Lukas Reschke
Roeland Jago Douma
Robin Appelman
Morris Jobke
Jenkins for ownCloud
Joas Schilling
Bjoern Schiessle
Georg Ehrke
Robin McCorkell
Andreas Fischer
Jörn Friedrich Dreyer
Vincent Cloutier
Clark Tomlinson
Stephan Peijnik
Bart Visscher
Morris Jobke
Scrutinizer Auto-Fixer
Frank Karlitschek
Björn Schießle
Arthur Schiwon
icewind1991
kondou
Michael Gapczynski