Jörn Friedrich Dreyer 3121dc8cb5 Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename ... Conflicts: apps/files/js/filelist.js		2013-10-23 12:02:06 +02:00
..
ajax	cleanup array value assignment	2013-10-23 11:01:05 +02:00
appinfo	Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity	2013-09-30 13:12:51 +02:00
command	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
css	prevent user from creating or renaming sth. to an existing filename	2013-10-22 18:11:03 +02:00
js	Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename	2013-10-23 12:02:06 +02:00
l10n	[tx-robot] updated from transifex	2013-10-19 08:27:13 -04:00
lib	adding PHPDoc comments	2013-10-22 22:38:05 +02:00
templates	Merge pull request #5310 from owncloud/hide_filestable-header_when_empty	2013-10-22 14:39:14 -07:00
tests	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02: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	Merge pull request #5310 from owncloud/hide_filestable-header_when_empty	2013-10-22 14:39:14 -07: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