Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Jörn Friedrich Dreyer
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Robin Appelman
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
Bart Visscher
530f3f8be9
Create functions to install standard hooks
...
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
blizzz
e0fdb8272b
Merge pull request #371 from butonic/sql_and_error_log_fixes
...
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer
ba91f9a237
add missing sql backticks, check sharing for error and add log
2012-11-12 12:04:46 +01:00
Thomas Tanghus
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
Felix Moeller
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
Robin Appelman
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Florian Hülsmann
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
Florian Hülsmann
b7bf28d1c7
Hook emission on sharing stuff
2012-10-26 20:53:32 +02:00
Michael Gapczynski
c00f5d164f
Fix unshareAll()
2012-10-16 16:27:23 -04:00
Michael Gapczynski
012ea1ed83
Add unshareAll() function to Share API
2012-10-16 15:38:52 -04:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Björn Schießle
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
Björn Schießle
8357754ff1
added "uid_owner" to select statement
2012-10-08 13:22:08 +02:00
Michael Gapczynski
5f462ec6f7
Fix - "Correct checking item source for share from same owner when generating item target"
2012-10-06 18:13:11 -04:00
Michael Gapczynski
68c8faf39c
Correct checking item source for share from same owner when generating item target
2012-10-02 16:37:39 -04:00
Björn Schießle
431d92e7b2
we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name
2012-10-02 21:37:10 +02:00
Björn Schießle
db954f5aba
remove unnecessary code and add missing items to select statement
2012-10-02 18:59:20 +02:00
Björn Schießle
3e3038cafc
merge all possible conflicts into on array
2012-10-02 13:10:46 +02:00
Björn Schießle
c6c0fcc7c8
We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
...
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated
If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00
Michael Gapczynski
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
Michael Gapczynski
f967bfc956
Properly format the share expiration time for the database, fixes bug oc-1779
2012-09-25 23:54:46 -04:00
Michael Gapczynski
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
Michael Gapczynski
37f0b85d3f
Fix problem with non share collection item types being treated as collections
2012-09-11 00:37:31 -04:00
Michael Gapczynski
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
Michael Gapczynski
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
Michael Gapczynski
3e7951e1e6
Normalize the file path for shared children as a precaution
2012-09-08 23:42:24 -04:00
Michael Gapczynski
fe7f095b08
Insert id for unique user group share rows
2012-09-08 23:09:58 -04:00
Michael Gapczynski
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
Michael Gapczynski
f23f719d99
Fix unsharing from self for group shares and add test for it
2012-09-08 20:15:47 -04:00
Michael Gapczynski
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
Michael Gapczynski
4c065deb55
Listen to post_deleteGroup hook in Share API
2012-09-02 20:01:09 -04:00
Michael Gapczynski
dc569ea300
Fix some warnings from Jenkins in the Share API
2012-09-02 19:30:01 -04:00
Michael Gapczynski
db37a454b3
Add parameter documentation
2012-09-02 18:29:55 -04:00
Michael Gapczynski
f0f2d93908
Restructure generateTarget for the post_addToGroup hook
2012-09-02 18:23:19 -04:00
Michael Gapczynski
a77c16371f
Make item targets be based off of the parent item target for reshares
2012-09-02 18:23:19 -04:00
Michael Gapczynski
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
Bart Visscher
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
Michael Gapczynski
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
Michael Gapczynski
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
Michael Gapczynski
0ad16e84c5
Fix share collection query
2012-08-27 20:37:38 -04:00
Michael Gapczynski
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00