summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3970 from owncloud/backport-3946-stable5Thomas Müller2013-07-081-11/+23
|\ | | | | Backport 3946 to stable5
| * Squashed commit of the following:Thomas Müller2013-07-081-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 70e6ad56ed5d00aeea8fe82b45047998dac92f80 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Sat Jul 6 00:11:42 2013 +0200 fixing check if public share is a folder or not commit 8e74ecec3f43a52a9a55871954171ef4073eab9d Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Sat Jul 6 00:04:01 2013 +0200 removing unused getSharedItem() commit 60ac0f274bbaa926dcec1800e952f2e0b1f05a50 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 17:39:41 2013 +0200 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function Conflicts: apps/files/ajax/upload.php commit f071f7439568ffd8b785cd96035cc2e616f61b01 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 11:30:53 2013 +0200 fixing Notice: Undefined index: isPublic commit d2f2c7e9b896fd0ac57fb8047501205fc37b2abc Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 09:58:41 2013 +0200 handle anonymous upload to reshared folder
* | Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixesJörn Friedrich Dreyer2013-07-081-3/+33
|\ \ | |/ |/| Stable5 oracle testsuite fixes
| * Oracle doesn't know & as bitwise ANDBart Visscher2013-07-041-6/+8
| | | | | | | | | | Conflicts: lib/public/share.php
| * for oracle use BITAND() instead of & in sharing permissions sqlJörn Friedrich Dreyer2013-07-041-3/+7
| |
| * fix type of numeric columnsJörn Friedrich Dreyer2013-07-041-0/+24
| |
| * check item id is setJörn Friedrich Dreyer2013-07-041-1/+1
| |
| * add missing backticksJörn Friedrich Dreyer2013-07-041-1/+1
| |
* | Backport of #3951 to stable5Thomas Müller2013-07-051-1/+12
|/ | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 46c1280e4f2ac61f0b3c5fed9d2a516cb000c009 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 13:45:21 2013 +0200 proper fix for getting the shared item if no user is logged in commit 99e32baec4464444a1a46ae47321e0378e367c3e Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 13:22:38 2013 +0200 php 5.3 compliant now commit 227e5f10016e362ed1302acb4426de391d4d9b4b Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 12:15:47 2013 +0200 get the real physical folder name for anonymous upload
* add public apiBjörn Schießle2013-07-031-0/+108
|
* add missing backticks all over the placeJörn Friedrich Dreyer2013-06-141-6/+6
| | | | | | | Conflicts: apps/files_encryption/lib/util.php lib/files/cache/backgroundwatcher.php lib/files/cache/cache.php
* fixes for pgsqlFlorin Peter2013-05-311-4/+4
|
* changed deprecated classFlorin Peter2013-05-311-1/+1
|
* fixes if cache returns falseFlorin Peter2013-05-311-4/+14
|
* fix $parent/$source typoFlorin Peter2013-05-311-2/+1
|
* fix indentionBjörn Schießle2013-05-311-5/+5
|
* remove unnecessary variableBjörn Schießle2013-05-311-2/+1
|
* use public API for error handling; improved while conditionBjörn Schießle2013-05-311-23/+20
|
* for external storages we never reach the path 'files', instead we need to ↵Björn Schießle2013-05-311-1/+2
| | | | leave the loop if no further parent exists
* if one public link share was found, we don't have to check it for the other ↵Björn Schießle2013-05-311-10/+12
| | | | folders
* check list of users with access to the file from the bottom to the top. This ↵Björn Schießle2013-05-311-7/+13
| | | | way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
* add post hooks to share API, needed by the encryption appBjörn Schießle2013-05-241-5/+25
|
* add post hooks to share API, needed by the encryption appBjörn Schießle2013-05-241-0/+13
|
* backport changes to share.php to enable the encryption app to get all users ↵Björn Schießle2013-05-241-0/+106
| | | | with access to a given file
* Initialize collectionTypes variable as falseMichael Gapczynski2013-05-171-0/+1
|
* 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