nextcloud/apps/files_sharing
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
..
ajax Revert santizing toaddress, because PHPMailer now throws exceptions 2012-07-11 16:02:43 -04:00
appinfo Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
css Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
js Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -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 remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02: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 Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
sharetest.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00