Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/js/filelist.js		2013-09-19 17:00:54 +02:00
..
ajax	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02: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	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
l10n	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
lib	Fixed ajax support to also update the current dir permissions	2013-09-13 19:59:15 +02:00
templates	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +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	move upload dialog css to separate file	2013-09-18 17:20:14 +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