Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master ... Conflicts: apps/files_sharing/lib/cache.php		2014-02-28 14:54:10 +01:00
..
share	adding share owner information to the file list	2014-02-20 18:24:42 +01:00
api.php	only add "received_from" if a share was found	2014-02-26 12:52:35 +01:00
cache.php	Merge branch 'master' into display-share-owner-master	2014-02-28 14:54:10 +01:00
maintainer.php	Remove "link" shares right after disabling the "allow_link_share" setting	2013-10-18 11:37:13 +02:00
permissions.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
sharedstorage.php	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
updater.php	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
watcher.php	Reuse the data retrieved from the cache in checkUpdate	2014-01-20 15:21:21 +01:00