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 +07:00
..
ajax	outsource sharing and deleted files previews to apps	2013-08-19 13:24:07 +07:00
appinfo	Remove "link" shares right after disabling the "allow_link_share" setting	2013-10-18 11:37:13 +07:00
css	fix style of public share page	2013-10-29 16:08:11 +07:00
js	pass the name of the item source from the browser to the server - no need to get the data via complicated db queries	2013-10-23 18:39:37 +07:00
l10n	[tx-robot] updated from transifex	2013-11-26 10:47:07 +07:00
lib	Use View::copy and View::rename when copying or renaming files in the shared storage	2013-11-11 17:58:20 +07:00
templates	readd sharing token to public template	2013-11-15 16:27:41 +07:00
tests	Fixed unit tests for files sharing watcher	2013-11-06 09:39:52 +07:00
public.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +07:00