Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 1 | -2/+4 |
| | |||||
* | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 1 | -29/+9 |
|\ | |||||
| * | Fix introduced style errors | Bart Visscher | 2012-10-27 | 1 | -29/+32 |
| | | |||||
| * | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -76/+70 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 1 | -19/+19 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | ||||
| * \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | Fix for running doing routing in lib/ocs.php | Bart Visscher | 2012-08-11 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | API: Remove old code. Move remaining methods to OC_OCS_Result. | Tom Needham | 2012-12-12 | 1 | -290/+0 |
| | | | | | |||||
* | | | | | API: Fix merge conflict remnants | Tom Needham | 2012-09-17 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Fix merge conflicts | Tom Needham | 2012-09-13 | 1 | -89/+85 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Respect coding style | Thomas Müller | 2012-09-10 | 1 | -88/+82 |
| | |_|/ | |/| | | |||||
| * | | | adding space between) and { | Thomas Mueller | 2012-09-07 | 1 | -33/+33 |
| | |/ | |/| | |||||
| * | | Whitespace fixes in lib | Bart Visscher | 2012-08-29 | 1 | -6/+6 |
| | | | |||||
* | | | Handle function not needed in lib/ocs.php | Tom Needham | 2012-07-31 | 1 | -181/+0 |
| | | | |||||
* | | | Make calling ocs/v1.php/config work | Bart Visscher | 2012-07-30 | 1 | -0/+18 |
| |/ |/| | |||||
* | | Small cleanup | Bart Visscher | 2012-07-25 | 1 | -2/+0 |
| | | |||||
* | | Convert new actions | Bart Visscher | 2012-07-25 | 1 | -8/+26 |
| | | |||||
* | | Merge branch 'master' into routing | Bart Visscher | 2012-07-25 | 1 | -4/+81 |
|\| | |||||
| * | add the calls for the new keyserver. Still not connectect to the encryption ↵ | Frank Karlitschek | 2012-07-24 | 1 | -4/+81 |
| | | | | | | | | system | ||||
* | | Merge branch 'master' into routing | Bart Visscher | 2012-07-24 | 1 | -425/+539 |
|\| | | | | | | | | | Conflicts: lib/ocs.php | ||||
| * | some indention fixes | Robin Appelman | 2012-07-24 | 1 | -17/+2 |
| | | |||||
| * | make it generic and implement a dummy call for quota set | Frank Karlitschek | 2012-07-23 | 1 | -27/+74 |
| | | |||||
| * | first part of the new new OCS CLOUD module. So far only quota is implemented. | Frank Karlitschek | 2012-07-23 | 1 | -419/+470 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Convert routing to ownCloud fluid interface | Bart Visscher | 2012-07-23 | 1 | -111/+81 |
| | | |||||
* | | Very basic conversion of ocs to Symfony Routing Component | Bart Visscher | 2012-07-21 | 1 | -57/+91 |
|/ | |||||
* | fix unused variables | Robin Appelman | 2012-07-20 | 1 | -5/+1 |
| | |||||
* | use our own serverHost call so that ownCloud works with reverse proxy servers | Frank Karlitschek | 2012-05-31 | 1 | -2/+2 |
| | |||||
* | update copyright | Frank Karlitschek | 2012-05-26 | 1 | -1/+1 |
| | |||||
* | remove Log completely | Robin Appelman | 2011-08-10 | 1 | -27/+1 |
| | |||||
* | user is a reserved word in postgresql | Serge Martin | 2011-08-07 | 1 | -1/+1 |
| | |||||
* | Renaming classes :-) | Jakob Sack | 2011-07-29 | 1 | -8/+8 |
| | |||||
* | One class per file! | Jakob Sack | 2011-07-29 | 1 | -2/+0 |
| | |||||
* | use oc_preferences to store ocs privatedata | Robin Appelman | 2011-07-28 | 1 | -58/+18 |
| | |||||
* | port OC_OCS to prepared statements | Robin Appelman | 2011-04-16 | 1 | -29/+24 |
| | |||||
* | add the option to use LIKE instead of = when getting data from OCS | Robin Appelman | 2011-03-17 | 1 | -4/+17 |
| | | | | also fix the returned keys | ||||
* | Start of the refactoring. Commit is quite big because I forgot to use git ↵ | Jakob Sack | 2011-03-01 | 1 | -0/+592 |
right from the beginning. Sorry. |