Bjoern Schiessle 534d93d2d3 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: apps/files/index.php		2013-09-16 10:40:06 +02:00
..
ajax	Merge pull request #4853 from owncloud/external-shared_mimetype-icons	2013-09-15 02:42:14 -07:00
appinfo	adding file templates for ods, odt and odp	2013-08-18 21:11:11 +02:00
console	remove cli check	2013-08-02 21:28:04 +02:00
css	Fixed loading mask/spinner to stay fixed on scroll	2013-09-13 19:59:15 +02:00
js	Merge pull request #4838 from owncloud/refactor_upload_js	2013-09-16 01:06:24 -07:00
l10n	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
lib	Fixed ajax support to also update the current dir permissions	2013-09-13 19:59:15 +02:00
templates	Merge branch 'master' into sharing_mail_notification_master	2013-09-16 10:40:06 +02: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 branch 'master' into sharing_mail_notification_master	2013-09-16 10:40:06 +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