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
..
app.php	remove unused variables	2012-07-20 18:56:18 +02:00
config.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
db.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
files.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
groupinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
json.php	Trying to get documentation to "Do The Right Thing" (TM)	2012-07-20 23:11:06 +02:00
response.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
share.php	Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks	2012-07-14 14:06:57 -04:00
template.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
user.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
util.php	provide recursiveArraySearch as Helper function and make available through API	2012-07-25 12:56:08 +02:00