Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php		2012-07-25 17:08:18 -04:00
..
ajax	Added CSRF checks to files_versions. Expect some error messages - and report them ;)	2012-07-17 11:57:38 +02:00
appinfo	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
css	added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts	2012-04-27 13:19:16 +01:00
js	Make file actions permissions aware	2012-07-25 16:33:08 -04:00
lib	fix ununsed variables	2012-07-21 00:20:27 +02:00
templates	Util::formatDate() expect $timestamp as double	2012-06-27 15:05:40 +02:00
history.php	use getStorage() to get versions location	2012-07-11 11:06:29 +02:00
settings-personal.php	added new user settings interface for deleting old file versions	2012-06-20 18:25:12 +01:00
settings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00