summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2183 from owncloud/fix-shared-statuses-againBernhard Posselt2013-03-111-10/+15
|\ | | | | Fix #2080 and fix #2141
| * Fix #2080 and fix #2141Michael Gapczynski2013-03-071-10/+15
| |
* | use pre_unshare hook, otherwise the share is already removed. Which means ↵Björn Schießle2013-03-081-0/+1
| | | | | | | | that we have no chance to determine which folder has to be updated
* | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-071-1/+1
|\| | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * Fix fetching source path of shared filesMichael Gapczynski2013-03-071-1/+1
| |
* | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-052-6/+31
|\| | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php
| * adding test case for getDefaultEmailAddress() + fixing #1844 againThomas Mueller2013-03-041-2/+2
| |
| * validate the generated email address and fall back to localhost.localdomain ↵Thomas Mueller2013-03-011-4/+7
| | | | | | | | | | | | in case it is not valid fixes #1844
| * Check resharing settingMichael Gapczynski2013-02-261-2/+24
| |
* | Fix group post_shared hookMichael Gapczynski2013-03-041-14/+14
| |
* | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-283-21/+22
|\| | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * Merge pull request #1856 from owncloud/fix_error_handling_stream_copyFrank Karlitschek2013-02-251-1/+2
| |\ | | | | | | don't use the number of written bytes as indicator if streamCopy() was successful
| | * return both, count and result if the operation succeeded or failed. Maybe in ↵Björn Schießle2013-02-221-1/+2
| | | | | | | | | | | | some cases it is useful to know how much bytes where copied
| * | Whitespace fixesBart Visscher2013-02-222-20/+20
| |/
* / Correct parent folders' ETags for all users with access to a shared fileMichael Gapczynski2013-02-261-0/+23
|/
* Style-fix: Breakup long linesBart Visscher2013-02-147-97/+231
|
* Whitespace indent fixesBart Visscher2013-02-141-3/+3
|
* Fix NoSpaceAfterComma and SpaceBeforeCommaBart Visscher2013-02-141-1/+1
|
* Fix indentation styleBart Visscher2013-02-141-10/+10
|
* Fix files router download linksBart Visscher2013-02-081-0/+14
|
* missing comma in sql statementThomas Müller2013-02-081-1/+1
|
* Merge pull request #1500 from chriskoch/patch-1Frank Karlitschek2013-02-061-2/+2
|\ | | | | Update lib/public/util.php
| * Update lib/public/util.phpChristian Koch2013-02-061-2/+2
| | | | | | The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
* | Correct lib/public/contacts.php testsBart Visscher2013-02-061-2/+2
|/
* port already approved bugfix to master, ↵Björn Schießle2013-02-061-1/+7
| | | | https://github.com/owncloud/core/pull/1479
* Merge pull request #1476 from ↵Thomas Müller2013-02-051-2/+2
|\ | | | | | | | | owncloud/disable-error-handler-while-running-phpunit disable error handler while running phpunit
| * fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
| |
* | Merge github.com:owncloud/coreSam Tuke2013-02-052-1/+24
|\|
| * Merge pull request #1234 from owncloud/fix-issue-192Thomas Müller2013-02-041-1/+2
| |\ | | | | | | Fix sharing issue with collection and children mismatches
| | * Fix sharing issue with collection and children mismatchesMichael Gapczynski2013-01-191-1/+2
| | |
| * | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
* | | Merge github.com:owncloud/coreSam Tuke2013-01-313-516/+170
|\| | | | | | | | | | | | | | Conflicts: lib/public/share.php
| * | 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
| | |/ | | | | | | | | | first commit with some infrastructure code
| * | 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
| |\ \ \ \ \