aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-1710-16/+32
|
* Merge pull request #21189 from owncloud/fix_21187Thomas Müller2015-12-152-1/+4
|\ | | | | File shares can't have create permissions
| * File shares can't have create permissionsRoeland Jago Douma2015-12-142-1/+4
| | | | | | | | fixes #21187
* | Fixed JS unit tests for fed owner display nameVincent Petry2015-12-141-0/+4
| |
* | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
| |
* | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-141-0/+8
|/
* Add test case for group share propagationRobin Appelman2015-12-104-78/+215
|
* Merge pull request #20989 from owncloud/fix_20769Thomas Müller2015-12-091-0/+41
|\ | | | | Update parent when moving share into recieved share
| * Update parent when moving share into recieved shareRoeland Jago Douma2015-12-071-0/+41
| | | | | | | | | | | | | | | | | | Fixes #20769 When I receive a share and move a share of myself into that share (which is allowed currently) I effectively hand over ownership of the files I move. So we need to update the share I move to have as a parent the share I move it into. Else our mounting system gets confused.
* | Merge pull request #21038 from owncloud/share-computesharepermissions-notstoreThomas Müller2015-12-092-1/+9
|\ \ | | | | | | Fix (re)share permission checks in a few code paths
| * | Add reshare permission checksVincent Petry2015-12-082-1/+9
| | | | | | | | | | | | | | | | | | | | | Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-092-2/+68
| | |
* | | More fixes to the docsJoas Schilling2015-12-082-2/+14
| | |
* | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-073-0/+16
|/ / | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-071-1/+0
| | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-076-8/+3
|/ | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* Merge pull request #20581 from owncloud/public-page-preview-hidpi-scaleThomas Müller2015-12-071-4/+8
|\ | | | | Fix hidpi previews on public page
| * Fix hidpi previews on public pageRobin Appelman2015-11-181-4/+8
| |
* | Merge pull request #20900 from owncloud/share-group-only-with-exact-matchThomas Müller2015-12-032-12/+41
|\ \ | | | | | | Only return the exact match, when it's allowed
| * | Only return the exact match, when it's allowedJoas Schilling2015-12-022-12/+41
| | |
* | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-022-19/+1
|\ \ \ | |/ / |/| | Adding system addressbook for users of this instance - a occ command …
| * | Add the user's cloud id to the vCardThomas Müller2015-12-022-19/+1
| | |
* | | Merge pull request #20884 from owncloud/fix_20713Thomas Müller2015-12-021-1/+3
|\ \ \ | |/ / |/| | Respect disabled incoming federated shares
| * | [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-021-1/+3
| | | | | | | | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-024-4/+4
|/ /
* | Fix the width of the share with inputMorris Jobke2015-11-301-1/+1
| | | | | | | | | | | | * the ID of this has changed to #shareWith-viewNUMBER and shouldn't be used in CSS * now uses the proper classes
* | Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdavThomas Müller2015-11-302-7/+10
|\ \ | | | | | | Fix public link getDownloadUrl to return Webdav public link
| * | Fix public link getDownloadUrl to return Webdav public linkVincent Petry2015-11-252-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is for apps that use getDownloadUrl() to access the Webdav endpoint for example for streaming. Also happens when clicking on the download action of a file. Note that the regular visible download URL is still the same.
* | | Adding more DB groups to test suitsThomas Müller2015-11-302-0/+4
| | | | | | | | | | | | Adding more DB groups to test suits
* | | Apply DB group annotation ...Thomas Müller2015-11-3024-38/+108
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-272-6/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-262-0/+20
| | |
* | | Merge pull request #20691 from owncloud/share2.0_di_fixesThomas Müller2015-11-253-124/+222
|\ \ \ | | | | | | | | [Sharing 2.0] di fixes
| * | | [Sharing 2.0] Use the rootfolder to get the path of a shareRoeland Jago Douma2015-11-243-49/+65
| | | | | | | | | | | | | | | | | | | | We need to use the rootfolder here since we also other people than the shareOwner can request a share.
| * | | [Sharing 2.0] Fix phpdoc etcRoeland Jago Douma2015-11-241-6/+6
| | | |
| * | | [Sharing 2.0] Move authentication to the OCS APIRoeland Jago Douma2015-11-243-62/+147
| | | |
| * | | [Sharing 2.0] Default share provider only generic DIRoeland Jago Douma2015-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | No injection of userfolders etc. Only generic DI components (IRootFolder) etc should be used to make sure we can also run this from the cli
| * | | [Sharing 2.0] Removed unused DI stuffRoeland Jago Douma2015-11-242-26/+23
| | | | | | | | | | | | | | | | | | | | The share manager etc should not care about filtering stuff. They should return what is asked for them.
* | | | Merge pull request #20439 from owncloud/etag-propagate-in-storageThomas Müller2015-11-2513-795/+54
|\ \ \ \ | | | | | | | | | | Take submount etag into account for folder etags
| * | | | update testsRobin Appelman2015-11-191-1/+2
| | | | |
| * | | | take the etag of child mounts into account for the folder etagRobin Appelman2015-11-1912-794/+52
| | | | | | | | | | | | | | | | | | | | this replaces shared etag propagation
* | | | | Merge pull request #20692 from owncloud/federation_auto_add_serversThomas Müller2015-11-241-0/+2
|\ \ \ \ \ | | | | | | | | | | | | auto-add ownClouds to the list of trusted servers
| * | | | | use hooks to auto add server to the list of trusted servers once a federated ↵Björn Schießle2015-11-241-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | share was created
* | | | | Merge pull request #20595 from owncloud/fix-double-slashesThomas Müller2015-11-241-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Avoid double slashes in URL when trying to add an remote share
| * | | | Avoid double slashes in URL when trying to add an remote shareblizzz2015-11-181-1/+5
| | | | | | | | | | | | | | | When being on a link share and clicking "Add to your ownCloud" a double slash might be inserted in the URL if the entered ownCloud host ended with a slash. Results in a server error.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-242-0/+2
| |/ / / |/| | |
* | | | Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-237-122/+62
|\ \ \ \ | | | | | | | | | | Web UI uses Webdav instead of ajax/* calls
| * | | | Properly join path sectionsVincent Petry2015-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This prevents double slashes that can mess up path comparisons in some cases.
| * | | | Fix port issue - options.host already has the port attachedThomas Müller2015-11-221-4/+2
| | | | |
| * | | | Parse share owner from Webdav to display in UIVincent Petry2015-11-221-1/+21
| | | | |