Thomas Müller 2a42021815 Merge branch 'master' into delete-fix ... Conflicts: core/css/styles.css		2013-07-23 16:24:34 +02:00
..
ajax	Split scanning logic from ajax file	2013-07-19 16:44:47 +02:00
appinfo	Files: use public api to register backgroundjob	2013-06-02 21:21:39 +02:00
css	fix delete button not showing in IE8	2013-07-22 11:18:51 +02:00
js	Merge branch 'master' into delete-fix	2013-07-23 16:24:34 +02:00
l10n	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04: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	Merge branch 'master' into disable-anon-upload-master	2013-07-22 11:36:52 +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	in case the encryption app is enabled we cannot yet allow anonymous upload	2013-07-12 17:05:58 +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