summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #1234 from owncloud/fix-issue-192Thomas Müller2013-02-041-1/+2
| |\
| | * Fix sharing issue with collection and children mismatchesMichael Gapczynski2013-01-191-1/+2
| * | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-0/+22
* | | Merge github.com:owncloud/coreSam Tuke2013-01-313-516/+170
|\| |
| * | 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
| |\|
| * | 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
| |\ \
| * | | Almost fix Shared scanner...Michael Gapczynski2013-01-071-1/+4
| * | | merge master into filesystemRobin Appelman2013-01-071-0/+44
| |\ \ \
| * \ \ \ merge master into filesystemRobin Appelman2013-01-033-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
| |\ \ \ \ \
| * | | | | | Initial support for file sharing with filesystem branchMichael Gapczynski2012-12-151-4/+4
| * | | | | | merge master into filesystemRobin Appelman2012-12-153-65/+223
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-301-25/+48
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-211-0/+103
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-153-11/+69
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-073-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-042-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-271-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use absolute paths when resolving mount pointsRobin Appelman2012-10-271-2/+2
| * | | | | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | move some stuff to the new apiRobin Appelman2012-10-261-6/+9
| * | | | | | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-261-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-171-1251/+1267
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | don't use depricated OC_FilesystemRobin Appelman2012-10-102-4/+4
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:owncloud/coreSam Tuke2013-01-239-29/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | 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
| |\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fixing returnsThomas Mueller2013-01-062-8/+8
| * | | | | | | | | | | | | | | | | fixing returnsThomas Mueller2013-01-061-4/+3
| * | | | | | | | | | | | | | | | | add missing returnThomas Mueller2013-01-061-1/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 10:15:46 +0000