Florin Peter 1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix ... Conflicts: apps/files_encryption/lib/util.php		2013-05-31 12:58:12 +02:00
..
files	[tx-robot] updated from transifex	2013-05-29 02:10:54 +02:00
files_encryption	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00
files_external	[tx-robot] updated from transifex	2013-05-31 02:04:40 +02:00
files_sharing	Implement getDirectoryPermissions() in Shared Permissions, fixes #2846	2013-05-29 18:22:54 -04:00
files_trashbin	add event.preventDefault to undelete function	2013-05-27 16:37:43 +02:00
files_versions	prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations	2013-05-30 22:05:52 +02:00
user_ldap	LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links	2013-05-30 16:55:21 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-05-31 02:04:40 +02:00