mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,266 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

35 Commits

Author SHA1 Message Date
Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Tom Needham 3cc3405536 API: Remove old code. Move remaining methods to OC_OCS_Result. 2012-12-12 18:06:07 +00:00
Bart Visscher fecfeac55d Fix introduced style errors 2012-10-27 17:45:15 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing 
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
 2012-09-28 15:38:49 +02:00
Tom Needham 8926038591 API: Fix merge conflict remnants 2012-09-17 12:07:42 +00:00
Tom Needham 227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Thomas Müller 5a65c5a46c Respect coding style 2012-09-10 14:59:08 +03:00
Bart Visscher 5eba579827 Merge branch 'master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
 2012-09-07 15:51:44 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher b483f2aab8 Merge branch 'master' into routing 
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
 2012-08-30 21:49:28 +02:00
Bart Visscher 52f2e7112e Whitespace fixes in lib 2012-08-29 20:28:45 +02:00
Bart Visscher 87d1cdb945 Fix for running doing routing in lib/ocs.php 2012-08-11 00:04:43 +02:00
Tom Needham 5922599f48 Handle function not needed in lib/ocs.php 2012-07-31 14:35:07 +01:00
Bart Visscher 7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Bart Visscher b3848581bf Small cleanup 2012-07-25 18:00:03 +02:00
Bart Visscher 5a0d476ab1 Convert new actions 2012-07-25 17:59:50 +02:00
Bart Visscher d579defc66 Merge branch 'master' into routing 2012-07-25 17:51:36 +02:00
Bart Visscher 0040b7109f Merge branch 'master' into routing 
Conflicts:
	lib/ocs.php
 2012-07-24 18:35:09 +02:00
Frank Karlitschek d28be8de64 add the calls for the new keyserver. Still not connectect to the encryption system 2012-07-24 15:18:52 +02:00
Robin Appelman 856d9c0b54 some indention fixes 2012-07-24 00:39:59 +02:00
Frank Karlitschek 21631be2ff make it generic and implement a dummy call for quota set 2012-07-23 19:43:28 +02:00
Bart Visscher 768b44b9b6 Convert routing to ownCloud fluid interface 2012-07-23 18:58:52 +02:00
Frank Karlitschek e7e1f234dd first part of the new new OCS CLOUD module. So far only quota is implemented. 
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
 2012-07-23 18:34:21 +02:00
Bart Visscher d0cae6a99a Very basic conversion of ocs to Symfony Routing Component 2012-07-21 19:43:50 +02:00
Robin Appelman 48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Frank Karlitschek d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Robin Appelman 1f1498ceca remove Log completely 2011-08-10 14:03:54 +02:00
Serge Martin acf7916e71 user is a reserved word in postgresql 2011-08-07 19:02:41 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
Robin Appelman 7d15a45e09 use oc_preferences to store ocs privatedata 2011-07-28 20:23:58 +02:00
Robin Appelman 9a575d1ded port OC_OCS to prepared statements 2011-04-16 13:55:33 +02:00
Robin Appelman 49a78333fb add the option to use LIKE instead of = when getting data from OCS 
also fix the returned keys
 2011-03-17 20:56:13 +01:00
Jakob Sack 132695ceb1 Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry. 2011-03-01 23:20:16 +01:00