aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-302-1/+28
|\
| * prepare user table to show and edit display namesBjörn Schießle2013-01-281-1/+1
| * use display name to show share_width and owner informationBjörn Schießle2013-01-251-0/+9
| * allow to get the display name from an abitrary userBjörn Schießle2013-01-251-2/+2
| * get all display names from users in a given groupBjörn Schießle2013-01-251-2/+2
| * get all display namesBjörn Schießle2013-01-251-0/+10
| * new branch which introduces display namesBjörn Schießle2013-01-241-1/+9
* | merge master into filesytemRobin Appelman2013-01-201-0/+10
|\|
| * Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-181-0/+10
| |\
| | * fixing indentThomas Mueller2013-01-181-10/+10
| | * Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-111-96/+484
| | |\
| | * \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-064-73/+117
| | |\ \
| | * | | the maximum upload size is now part of the response of the upload and delete ...Thomas Müller2012-12-201-0/+10
* | | | | Disable fancy folder sharing for nowMichael Gapczynski2013-01-181-28/+28
* | | | | Fix mergeMichael Gapczynski2013-01-181-4/+4
* | | | | merge master into filesystemRobin Appelman2013-01-169-29/+34
|\| | | |
| * | | | Whitespace cleanupBart Visscher2013-01-164-9/+8
| * | | | Spaces to tabsBart Visscher2013-01-162-3/+3
| * | | | Merge pull request #1178 from owncloud/return_true_because_of_poniesThomas Müller2013-01-151-3/+1
| |\ \ \ \
| | * | | | Remove uneeded returnsLukas Reschke2013-01-141-3/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-141-96/+484
| |\| | |
| | * | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-96/+484
| | | |/ | | |/|
| * | | fixing returnsThomas Mueller2013-01-062-8/+8
| * | | fixing returnsThomas Mueller2013-01-061-4/+3
| * | | add missing returnThomas Mueller2013-01-061-1/+2
| * | | fixing undefined variable $whereThomas Mueller2013-01-061-1/+1
| |/ /
* | | Almost fix Shared scanner...Michael Gapczynski2013-01-071-1/+4
* | | merge master into filesystemRobin Appelman2013-01-071-0/+44
|\| |
| * | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-0/+44
| |\ \
| | * \ Merge branch 'master' into ocs_apiTom Needham2012-12-312-11/+47
| | |\ \
| | * \ \ Merge branch 'master' into ocs_apiTom Needham2012-12-161-16/+17
| | |\ \ \
| | * \ \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-148-45/+386
| | |\ \ \ \
| | * \ \ \ \ Merge master into ocs_apiTom Needham2012-10-284-44/+141
| | |\ \ \ \ \
| | * | | | | | Allow apps to pass defaults and requirements for their API callsTom Needham2012-10-281-2/+4
| | * | | | | | API: Default to user authentication levelTom Needham2012-09-131-2/+3
| | * | | | | | Fix merge conflictsTom Needham2012-09-1311-310/+1598
| | |\ \ \ \ \ \
| | * | | | | | | Fix error with namespacingTom Needham2012-07-311-1/+1
| | * | | | | | | Make method staticTom Needham2012-07-311-1/+1
| | * | | | | | | Add public class for registering api callsTom Needham2012-07-301-0/+41
* | | | | | | | | merge master into filesystemRobin Appelman2013-01-033-71/+71
|\| | | | | | | |
| * | | | | | | | phpdoc fixes for public apiRobin Appelman2013-01-023-71/+71
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Forgot to select storage from filecacheMichael Gapczynski2013-01-011-1/+1
* | | | | | | | Fix data for shared root folderMichael Gapczynski2012-12-291-1/+1
* | | | | | | | Fix shared statuses inside foldersMichael Gapczynski2012-12-261-1/+2
* | | | | | | | merge master into filesystemRobin Appelman2012-12-251-0/+36
|\| | | | | | |
| * | | | | | | fixing variable nameThomas Müller2012-12-211-2/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | fixes default email sender addressRandolph Carter2012-12-191-0/+36
| | |_|_|_|/ | |/| | | |
* | | | | | Initial support for file sharing with filesystem branchMichael Gapczynski2012-12-151-4/+4
* | | | | | merge master into filesystemRobin Appelman2012-12-153-65/+223
|\| | | | |
| * | | | | More whitespace fixesBart Visscher2012-12-151-16/+17
| | |_|_|/ | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 17:21:42 +0000