Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults ... Conflicts: apps/files/ajax/newfile.php		2013-08-16 00:13:10 +02:00
..
ajax	Merge branch 'master' into mimetype-defaults	2013-08-16 00:13:10 +02:00
appinfo	actually register html template	2013-08-07 23:48:44 +02:00
console	remove cli check	2013-08-02 21:28:04 +02:00
css	Merge pull request #3912 from owncloud/css_cleanup_kondou	2013-08-08 07:31:01 -07:00
js	Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox	2013-08-15 14:08:01 -07:00
l10n	fixing all broken translation files	2013-08-15 15:41:45 +02:00
lib	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +02:00
templates	fix typo	2013-07-26 11:51:18 +02:00
tests	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +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	disable "deleted files" button if trash bin is empty	2013-07-26 11:14:29 +02: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