Tom Needham
|
6eb194b702
|
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
|
2012-12-31 15:47:15 +00:00 |
|
Tom Needham
|
3cc3405536
|
API: Remove old code. Move remaining methods to OC_OCS_Result.
|
2012-12-12 18:06:07 +00:00 |
|
Tom Needham
|
2a4b554ca6
|
API: OCS methods now use OC_OCS_Result to return data
|
2012-12-12 17:35:58 +00:00 |
Bart Visscher
|
28537037ae
|
Fixup OCS modules
|
2012-07-31 22:19:11 +02:00 |
|
Bart Visscher
|
0a9ca42c34
|
Fix OC_OCS_Privatedata::privateDataGet
|
2012-07-30 21:19:03 +02:00 |
Tom Needham
|
9072106048
|
Move OCS methods to lib/ocs/.php
|
2012-07-30 12:42:18 +00:00 |