Michael Gapczynski 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
..
ajax	Add additional error handling for emailing private links	2012-07-29 18:02:09 -04:00
appinfo	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
css	Implement CRUDS in share dropdown, and some clean-up	2012-07-26 21:56:22 -04:00
js	Add additional error handling for emailing private links	2012-07-29 18:02:09 -04:00
lib/share	Make file actions permissions aware	2012-07-25 16:33:08 -04:00
templates	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
get.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
lib_share.php	Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'	2012-07-28 11:06:36 -04:00
list.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
sharedstorage.php	No longer need hash() in shared storage, already implemented by the common file storage	2012-07-25 17:13:48 -04:00
sharetest.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00