Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js		2012-07-31 15:00:04 -04:00
..
app.php	declare OCP\App::register as deprecated	2012-07-26 15:16:07 +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	Remove break, it broke the statuses :)	2012-07-31 14:21:46 -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	Add search, limit, and offset parameters to getUsers() and getGroups()	2012-07-30 20:20:46 -04: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