Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master ...

increased version number to trigger db update

Conflicts:
	lib/util.php

2013-09-05 13:39:45 +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 expiration date if it is already set

2013-08-30 17:20:10 +02:00

files.php

functions in OCP should be static

2013-07-25 15:25:17 +02:00

groupinterface.php

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +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

fixing this obvious typo directly

2013-09-01 08:23:11 +02:00

response.php

fixing returns

2013-01-06 23:59:02 +01:00

share.php

Merge branch 'master' into sharing_mail_notification_master

2013-09-05 13:39:45 +02: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

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +02: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 +02:00