Michael Gapczynski ea23854328 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php		2012-08-06 13:49:54 -04:00
..
app.php	Remove OC_App::register call in OCP\App::register	2012-07-30 21:26:14 +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	Lots of refactoring to share API	2012-08-06 11:27:13 -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