40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01:00
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
1158447499
missing comma in sql statement
2013-02-08 13:49:26 +01:00
223f538bb8
Merge pull request #1500 from chriskoch/patch-1
...
Update lib/public/util.php
2013-02-06 13:00:10 -08:00
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
a4f909cefd
Update lib/public/util.php
...
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
2013-02-06 17:22:07 +01:00
9e08f85c5e
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
2013-02-06 14:19:32 +01:00
74157902d7
Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
...
disable error handler while running phpunit
2013-02-05 14:35:11 -08:00
10ea45c916
fix failing test cases due to wrong typing
2013-02-05 20:19:54 +01:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
3b8c071df4
Merge pull request #1234 from owncloud/fix-issue-192
...
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
316eef3ded
Fix sharing issue with collection and children mismatches
2013-01-19 01:50:02 -05:00
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
de0ed634f2
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
2013-01-14 17:05:47 +00:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
Björn Schießle
Sam Tuke
Bart Visscher
Thomas Müller
Frank Karlitschek
Christian Koch
Stefan Herbrechtsmeier
Robin Appelman
Michael Gapczynski
Lukas Reschke
Jörn Friedrich Dreyer