Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +07:00
..
api.php	Style-fix: Breakup long lines	2013-02-14 08:38:37 +07:00
app.php	fixing returns	2013-01-06 23:57:27 +07:00
backgroundjob.php	Move legacy backgroundjob classes to a place where they can be autoloaded	2013-05-03 16:42:48 +07:00
config.php	Fix returns of values in OCP\Config	2013-05-07 20:07:28 +07:00
constants.php	Whitespace cleanup	2013-01-16 18:09:16 +07:00
contacts.php	Correct lib/public/contacts.php tests	2013-02-06 17:37:47 +07:00
db.php	Whitespace cleanup	2013-01-16 18:09:16 +07:00
defaults.php	add public api	2013-07-04 10:11:55 +07:00
files.php	functions in OCP should be static	2013-07-25 15:25:17 +07:00
groupinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +07:00
iaddressbook.php	Fix indentation style	2013-02-14 08:36:26 +07:00
image.php	need to use \OC_Image to escape OCP namespace	2013-07-22 17:25:55 +07:00
json.php	style fixes for public json api	2012-09-08 16:14:06 +07:00
response.php	fixing returns	2013-01-06 23:59:02 +07:00
share.php	cancel sharing if some users doesn't have a working encryption set-up.	2013-08-01 13:04:55 +07:00
template.php	add proper deprecated tag	2013-07-21 10:30:00 +07:00
user.php	Correct casing of OC_User and pass through the params to getUsers	2013-07-19 17:32:31 +07:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +07:00
util.php	check if some encrypted files are left after the app was disabled and warn the user	2013-08-12 17:25:27 +07:00