nextcloud/apps/files
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 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
appinfo fix broken properties in the database 2012-07-23 10:34:01 +02:00
css Make sure sharing and versions dropdowns come down in the same location for all files 2012-05-19 11:24:23 -04:00
js Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
l10n update translations 2012-06-06 00:29:28 +02:00
templates Make file actions permissions aware 2012-07-25 16:33:08 -04:00
admin.php Revert 2012-06-11 13:27:32 +02:00
download.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
index.php Change read only check to isCreatable 2012-07-24 21:35:03 -04:00
settings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
share.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00