Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3970 from owncloud/backport-3946-stable5 | Thomas Müller | 2013-07-08 | 1 | -11/+23 |
|\ | | | | | Backport 3946 to stable5 | ||||
| * | Squashed commit of the following: | Thomas Müller | 2013-07-08 | 1 | -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_fixes | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -3/+33 |
|\ \ | |/ |/| | Stable5 oracle testsuite fixes | ||||
| * | Oracle doesn't know & as bitwise AND | Bart Visscher | 2013-07-04 | 1 | -6/+8 |
| | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| * | for oracle use BITAND() instead of & in sharing permissions sql | Jörn Friedrich Dreyer | 2013-07-04 | 1 | -3/+7 |
| | | |||||
| * | fix type of numeric columns | Jörn Friedrich Dreyer | 2013-07-04 | 1 | -0/+24 |
| | | |||||
| * | check item id is set | Jörn Friedrich Dreyer | 2013-07-04 | 1 | -1/+1 |
| | | |||||
| * | add missing backticks | Jörn Friedrich Dreyer | 2013-07-04 | 1 | -1/+1 |
| | | |||||
* | | Backport of #3951 to stable5 | Thomas Müller | 2013-07-05 | 1 | -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 api | Björn Schießle | 2013-07-03 | 1 | -0/+108 |
| | |||||
* | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -6/+6 |
| | | | | | | | Conflicts: apps/files_encryption/lib/util.php lib/files/cache/backgroundwatcher.php lib/files/cache/cache.php | ||||
* | fixes for pgsql | Florin Peter | 2013-05-31 | 1 | -4/+4 |
| | |||||
* | changed deprecated class | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | |||||
* | fixes if cache returns false | Florin Peter | 2013-05-31 | 1 | -4/+14 |
| | |||||
* | fix $parent/$source typo | Florin Peter | 2013-05-31 | 1 | -2/+1 |
| | |||||
* | fix indention | Björn Schießle | 2013-05-31 | 1 | -5/+5 |
| | |||||
* | remove unnecessary variable | Björn Schießle | 2013-05-31 | 1 | -2/+1 |
| | |||||
* | use public API for error handling; improved while condition | Björn Schießle | 2013-05-31 | 1 | -23/+20 |
| | |||||
* | for external storages we never reach the path 'files', instead we need to ↵ | Björn Schießle | 2013-05-31 | 1 | -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ßle | 2013-05-31 | 1 | -10/+12 |
| | | | | folders | ||||
* | check list of users with access to the file from the bottom to the top. This ↵ | Björn Schießle | 2013-05-31 | 1 | -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 app | Björn Schießle | 2013-05-24 | 1 | -5/+25 |
| | |||||
* | add post hooks to share API, needed by the encryption app | Björn Schießle | 2013-05-24 | 1 | -0/+13 |
| | |||||
* | backport changes to share.php to enable the encryption app to get all users ↵ | Björn Schießle | 2013-05-24 | 1 | -0/+106 |
| | | | | with access to a given file | ||||
* | Initialize collectionTypes variable as false | Michael Gapczynski | 2013-05-17 | 1 | -0/+1 |
| | |||||
* | Merge pull request #2183 from owncloud/fix-shared-statuses-again | Bernhard Posselt | 2013-03-11 | 1 | -10/+15 |
|\ | | | | | Fix #2080 and fix #2141 | ||||
| * | Fix #2080 and fix #2141 | Michael Gapczynski | 2013-03-07 | 1 | -10/+15 |
| | | |||||
* | | use pre_unshare hook, otherwise the share is already removed. Which means ↵ | Björn Schießle | 2013-03-08 | 1 | -0/+1 |
| | | | | | | | | that we have no chance to determine which folder has to be updated | ||||
* | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-07 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| * | Fix fetching source path of shared files | Michael Gapczynski | 2013-03-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-05 | 2 | -6/+31 |
|\| | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php | ||||
| * | adding test case for getDefaultEmailAddress() + fixing #1844 again | Thomas Mueller | 2013-03-04 | 1 | -2/+2 |
| | | |||||
| * | validate the generated email address and fall back to localhost.localdomain ↵ | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
| | | | | | | | | | | | | in case it is not valid fixes #1844 | ||||
| * | Check resharing setting | Michael Gapczynski | 2013-02-26 | 1 | -2/+24 |
| | | |||||
* | | Fix group post_shared hook | Michael Gapczynski | 2013-03-04 | 1 | -14/+14 |
| | | |||||
* | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-02-28 | 3 | -21/+22 |
|\| | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| * | Merge pull request #1856 from owncloud/fix_error_handling_stream_copy | Frank Karlitschek | 2013-02-25 | 1 | -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ßle | 2013-02-22 | 1 | -1/+2 |
| | | | | | | | | | | | | some cases it is useful to know how much bytes where copied | ||||
| * | | Whitespace fixes | Bart Visscher | 2013-02-22 | 2 | -20/+20 |
| |/ | |||||
* / | Correct parent folders' ETags for all users with access to a shared file | Michael Gapczynski | 2013-02-26 | 1 | -0/+23 |
|/ | |||||
* | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 7 | -97/+231 |
| | |||||
* | Whitespace indent fixes | Bart Visscher | 2013-02-14 | 1 | -3/+3 |
| | |||||
* | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -10/+10 |
| | |||||
* | Fix files router download links | Bart Visscher | 2013-02-08 | 1 | -0/+14 |
| | |||||
* | missing comma in sql statement | Thomas Müller | 2013-02-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1500 from chriskoch/patch-1 | Frank Karlitschek | 2013-02-06 | 1 | -2/+2 |
|\ | | | | | Update lib/public/util.php | ||||
| * | Update lib/public/util.php | Christian Koch | 2013-02-06 | 1 | -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 tests | Bart Visscher | 2013-02-06 | 1 | -2/+2 |
|/ | |||||
* | port already approved bugfix to master, ↵ | Björn Schießle | 2013-02-06 | 1 | -1/+7 |
| | | | | https://github.com/owncloud/core/pull/1479 |