Thomas Müller 7425efade7 Merge branch 'master' into oc_preview ... Conflicts: 3rdparty lib/template.php		2013-07-30 00:34:36 +02:00
..
api.php	Style-fix: Breakup long lines	2013-02-14 08:38:37 +01:00
app.php	fixing returns	2013-01-06 23:57:27 +01:00
backgroundjob.php	Move legacy backgroundjob classes to a place where they can be autoloaded	2013-05-03 16:42:48 +02:00
config.php	Fix returns of values in OCP\Config	2013-05-07 20:07:28 +02:00
constants.php	Whitespace cleanup	2013-01-16 18:09:16 +01:00
contacts.php	Correct lib/public/contacts.php tests	2013-02-06 17:37:47 +01:00
db.php	Whitespace cleanup	2013-01-16 18:09:16 +01:00
defaults.php	add public api	2013-07-04 10:11:55 +02:00
files.php	functions in OCP should be static	2013-07-25 15:25:17 +02:00
groupinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
iaddressbook.php	Fix indentation style	2013-02-14 08:36:26 +01:00
image.php	need to use \OC_Image to escape OCP namespace	2013-07-22 17:25:55 +02:00
json.php	style fixes for public json api	2012-09-08 16:14:06 +02:00
preview.php	add class='preview-icon' to rows in file app that make use of previews	2013-07-29 15:47:17 +02:00
response.php	fixing returns	2013-01-06 23:59:02 +01:00
share.php	Only emit permissions hook for files and and include path	2013-07-08 17:28:18 -04:00
template.php	Merge branch 'master' into oc_preview	2013-07-30 00:34:36 +02:00
user.php	Correct casing of OC_User and pass through the params to getUsers	2013-07-19 17:32:31 +02:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
util.php	return result from getL10N	2013-07-22 15:52:02 +02:00