Commit Graph

6 Commits

Author SHA1 Message Date
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 07111ff672 Allow apps to pass defaults and requirements for their API calls 2012-10-28 11:04:23 +00:00
Tom Needham 8b409dfe2a API: Default to user authentication level 2012-09-13 14:15:04 +00:00
Tom Needham b05639e745 Fix error with namespacing 2012-07-31 10:10:15 +00:00
Tom Needham cc6911e1f7 Make method static 2012-07-31 09:28:12 +00:00
Tom Needham 3a0e3708a5 Add public class for registering api calls 2012-07-30 14:26:15 +00:00