Commit Graph

30 Commits

Author SHA1 Message Date
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher 5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Tom Needham 6d74aa0d00 more code style 2013-02-10 12:46:41 +01:00
Robin Appelman ad360296b9 Update tests and apps to the new \OC\Files\Filesystem::init signature 2013-02-11 11:06:09 +01:00
Tom Needham ab8777a623 Merge branch 'ocs_capabilities' into ocs_multiple_methods 2013-02-09 11:56:30 +00:00
Tom Needham 742cafb03a Change strucutre of cloud/capabilities response 2013-02-09 11:22:29 +00:00
Tom Needham aec5ab3ad2 Remove app related values and change structure of /cloud/capabilties call 2013-02-04 18:34:28 +00:00
Tom Needham 934735043b API: Remove api response structure from OC_OCS_Result, handle multiple registered methods for api calls 2013-01-25 12:48:59 +00:00
Tom Needham a08e8632bb Add <syncpollinterval> and order the result for /cloud/capabilities 2013-01-16 21:57:06 +00:00
Tom Needham 0956cae39e Add new /cloud/capabilities route and remove unused methods 2013-01-16 20:43:46 +00:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller 388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke 31b1a73e1f Check if user is admin - bool
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Robin Appelman e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller a143e77ee4 removing unused parameter $parameters
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
Tom Needham 9626d9ce31 Code cleanup and add copyright info 2012-12-31 16:08:21 +00:00
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 218a5ea890 Remove unused methods 2012-12-31 14:16:29 +00:00
Tom Needham 228a75ebaa API: Include totalitems and itemsperpage meta data when needed. 2012-12-12 20:58:40 +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
Tom Needham 140141edf2 API: Further tidying, implement OC_OCS_Result object for api results. 2012-12-12 16:50:25 +00:00
Tom Needham 28a11959d7 API: Fix /person/check api method 2012-09-05 12:32:54 +00:00
Tom Needham 470b87f625 Fix ocs/person/check 2012-09-05 09:07:15 +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