Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php		2013-11-27 15:08:09 +01:00
..
ajax	Files app backend now normalizes paths before rendering templates	2013-11-14 13:24:05 +01:00
appinfo	introducing new dav property {xmlns:oc="http://owncloud.org/ns}id	2013-10-23 16:03:57 +02:00
command	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
css	Added min width to files table	2013-11-21 14:45:24 +01:00
js	Merge pull request #5641 from owncloud/filestrash-emptytrash	2013-11-25 05:24:11 -08:00
l10n	[tx-robot] updated from transifex	2013-11-26 10:47:07 -05:00
lib	Fixed folder icon for home storage	2013-11-06 15:11:14 +01:00
templates	disable trahs in files_sharing/public.php	2013-11-21 12:06:35 +01:00
tests	Quota storage wrapper is now used for all users in sharing mode	2013-11-21 12:04:54 +01:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +01:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
index.php	public upload now also works with encryption enabled	2013-11-21 00:23:38 +01:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
triggerupdate.php	Add a CLI script for manually triggering checking a folder for updates	2013-06-23 17:49:38 +02:00