Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-20 | 4 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-19 | 2 | -0/+2 |
| | |||||
* | Removed deprecated OC_Helper::mimeTypeIcon function | Roeland Jago Douma | 2015-12-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType | Thomas Müller | 2015-12-18 | 1 | -2/+4 |
|\ | | | | | Use proper public API for OC_Helper::getFileNameMimeType | ||||
| * | Use proper public API for OC_Helper::getFileNameMimeType | Morris Jobke | 2015-12-17 | 1 | -2/+4 |
| | | |||||
* | | Removed deprecated function OC_User::deleteUser | Roeland Jago Douma | 2015-12-17 | 2 | -4/+8 |
| | | | | | | | | Replaced with proper OCP calls | ||||
* | | Removed deprecated private OC_User::createUser | Roeland Jago Douma | 2015-12-17 | 2 | -2/+2 |
|/ | | | | | All function calls are replaced with the recommended (which was already the body of the function). | ||||
* | Merge pull request #21200 from owncloud/files-authorizationheader | Thomas Müller | 2015-12-17 | 1 | -1/+2 |
|\ | | | | | Use Authorization headers for public webdav in web UI | ||||
| * | Use Authorization headers for public webdav instead of URL | Vincent Petry | 2015-12-14 | 1 | -1/+2 |
| | | | | | | | | | | | | Instead of prepending the token as username in the URL, use the Authorization header instead. This is because IE9 considers this a cross-domain call and refuses to do it in the first place. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-17 | 10 | -16/+32 |
| | | |||||
* | | Merge pull request #21189 from owncloud/fix_21187 | Thomas Müller | 2015-12-15 | 2 | -1/+4 |
|\ \ | | | | | | | File shares can't have create permissions | ||||
| * | | File shares can't have create permissions | Roeland Jago Douma | 2015-12-14 | 2 | -1/+4 |
| |/ | | | | | | | fixes #21187 | ||||
* | | Fixed JS unit tests for fed owner display name | Vincent Petry | 2015-12-14 | 1 | -0/+4 |
| | | |||||
* | | show display name but internally use the user name | Björn Schießle | 2015-12-14 | 6 | -6/+11 |
| | | |||||
* | | don't allow to create a federated share if source and target server are the same | Björn Schießle | 2015-12-14 | 1 | -0/+8 |
|/ | |||||
* | Add test case for group share propagation | Robin Appelman | 2015-12-10 | 4 | -78/+215 |
| | |||||
* | Merge pull request #20989 from owncloud/fix_20769 | Thomas Müller | 2015-12-09 | 1 | -0/+41 |
|\ | | | | | Update parent when moving share into recieved share | ||||
| * | Update parent when moving share into recieved share | Roeland Jago Douma | 2015-12-07 | 1 | -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-notstore | Thomas Müller | 2015-12-09 | 2 | -1/+9 |
|\ \ | | | | | | | Fix (re)share permission checks in a few code paths | ||||
| * | | Add reshare permission checks | Vincent Petry | 2015-12-08 | 2 | -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 transifex | Jenkins for ownCloud | 2015-12-09 | 2 | -2/+68 |
| | | | |||||
* | | | More fixes to the docs | Joas Schilling | 2015-12-08 | 2 | -2/+14 |
| | | | |||||
* | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 3 | -0/+16 |
|/ / | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 1 | -1/+0 |
| | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 6 | -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-scale | Thomas Müller | 2015-12-07 | 1 | -4/+8 |
|\ | | | | | Fix hidpi previews on public page | ||||
| * | Fix hidpi previews on public page | Robin Appelman | 2015-11-18 | 1 | -4/+8 |
| | | |||||
* | | Merge pull request #20900 from owncloud/share-group-only-with-exact-match | Thomas Müller | 2015-12-03 | 2 | -12/+41 |
|\ \ | | | | | | | Only return the exact match, when it's allowed | ||||
| * | | Only return the exact match, when it's allowed | Joas Schilling | 2015-12-02 | 2 | -12/+41 |
| | | | |||||
* | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-users | Thomas Müller | 2015-12-02 | 2 | -19/+1 |
|\ \ \ | |/ / |/| | | Adding system addressbook for users of this instance - a occ command … | ||||
| * | | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 2 | -19/+1 |
| | | | |||||
* | | | Merge pull request #20884 from owncloud/fix_20713 | Thomas Müller | 2015-12-02 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Respect disabled incoming federated shares | ||||
| * | | [Sharing] Respect disabled incoming federated shares | Roeland Jago Douma | 2015-12-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | Only fetch the incoming federated shares if incoming shares are actually enabled. Fixes #20713 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-02 | 4 | -4/+4 |
|/ / | |||||
* | | Fix the width of the share with input | Morris Jobke | 2015-11-30 | 1 | -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-webdav | Thomas Müller | 2015-11-30 | 2 | -7/+10 |
|\ \ | | | | | | | Fix public link getDownloadUrl to return Webdav public link | ||||
| * | | Fix public link getDownloadUrl to return Webdav public link | Vincent Petry | 2015-11-25 | 2 | -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 suits | Thomas Müller | 2015-11-30 | 2 | -0/+4 |
| | | | | | | | | | | | | Adding more DB groups to test suits | ||||
* | | | Apply DB group annotation ... | Thomas Müller | 2015-11-30 | 24 | -38/+108 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-27 | 2 | -6/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-26 | 2 | -0/+20 |
| | | | |||||
* | | | Merge pull request #20691 from owncloud/share2.0_di_fixes | Thomas Müller | 2015-11-25 | 3 | -124/+222 |
|\ \ \ | | | | | | | | | [Sharing 2.0] di fixes | ||||
| * | | | [Sharing 2.0] Use the rootfolder to get the path of a share | Roeland Jago Douma | 2015-11-24 | 3 | -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 etc | Roeland Jago Douma | 2015-11-24 | 1 | -6/+6 |
| | | | | |||||
| * | | | [Sharing 2.0] Move authentication to the OCS API | Roeland Jago Douma | 2015-11-24 | 3 | -62/+147 |
| | | | | |||||
| * | | | [Sharing 2.0] Default share provider only generic DI | Roeland Jago Douma | 2015-11-24 | 1 | -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 stuff | Roeland Jago Douma | 2015-11-24 | 2 | -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-storage | Thomas Müller | 2015-11-25 | 13 | -795/+54 |
|\ \ \ \ | | | | | | | | | | | Take submount etag into account for folder etags | ||||
| * | | | | update tests | Robin Appelman | 2015-11-19 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | take the etag of child mounts into account for the folder etag | Robin Appelman | 2015-11-19 | 12 | -794/+52 |
| | | | | | | | | | | | | | | | | | | | | this replaces shared etag propagation |