Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix mount type root detection | Vincent Petry | 2015-12-14 | 2 | -7/+40 |
| | | | | | | | | | | | Since Webdav doesn't contain that information, we need to rely on the parent folder's mount type to find out whether a child item is a shared/external root or not. Fixed the mount type detection logic and added unit test. Also added a fix that ignores detection if no parent folder exists (ex: shared file list, favorites, etc) | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-13 | 8 | -2/+36 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-12 | 86 | -0/+150 |
| | |||||
* | Merge pull request #21153 from owncloud/files-deleteactiontext | Thomas Müller | 2015-12-11 | 3 | -5/+49 |
|\ | | | | | Bring back file delete action text to be based on context | ||||
| * | Bring back file delete action text to be based on context | Vincent Petry | 2015-12-11 | 3 | -5/+49 |
| | | | | | | | | | | | | | | | | For received shares, the delete action becomes "Unshare" and for personal mounts it becomes "Disconnect storage". This also makes it possible from now on to pass a function to a file action's "displayName" attribute. | ||||
* | | skip test if we cant use the filesystem when not logged in | Robin Appelman | 2015-12-11 | 1 | -2/+5 |
| | | |||||
* | | Fix thrashbin wrapper when no user is loggedin | Robin Appelman | 2015-12-11 | 2 | -2/+13 |
|/ | |||||
* | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader | Thomas Müller | 2015-12-11 | 1 | -1/+1 |
|\ | | | | | Properly check X-Requested-With header in case of multiple values | ||||
| * | Properly check X-Requested-With header in case of multiple values | Vincent Petry | 2015-12-11 | 1 | -1/+1 |
| | | | | | | | | Saw this happening in IE8... | ||||
* | | Merge pull request #21135 from owncloud/add-polyfill | Thomas Müller | 2015-12-11 | 3 | -111/+9 |
|\ \ | | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities | ||||
| * | | Use PHP polyfills | Lukas Reschke | 2015-12-11 | 3 | -111/+9 |
| | | | |||||
* | | | Merge pull request #21045 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-11 | 10 | -9/+38 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | adjust PHPDoc | Thomas Müller | 2015-12-10 | 2 | -0/+4 |
| | | | | |||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-10 | 10 | -9/+34 |
| |/ / | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* / / | Catch exception when querying direct download link | Vincent Petry | 2015-12-10 | 2 | -3/+33 |
|/ / | |||||
* | | Merge pull request #21114 from owncloud/group-propagation-tests | Thomas Müller | 2015-12-10 | 4 | -78/+215 |
|\ \ | |/ |/| | Add test case for group share propagation | ||||
| * | Add test case for group share propagation | Robin Appelman | 2015-12-10 | 4 | -78/+215 |
| | | |||||
* | | Deduplicate version expire jobs | Morris Jobke | 2015-12-10 | 2 | -37/+10 |
|/ | | | | | | * versionSize is calculated anyway in the expire job - > dropped * offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation * fixes #21108 | ||||
* | Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master | Thomas Müller | 2015-12-10 | 2 | -4/+283 |
|\ | | | | | Looks like ceph requires more time to come up .... | ||||
| * | Looks like ceph requires more time to come up .... | Thomas Müller | 2015-12-09 | 2 | -4/+283 |
| | | | | | | | | | | | | Use sed - not replace apply btrfs hack | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-10 | 8 | -0/+54 |
| | | |||||
* | | Merge pull request #21077 from owncloud/external-index-names | Thomas Müller | 2015-12-09 | 2 | -7/+1 |
|\ \ | |/ |/| | Let doctrine generate index names for files_external | ||||
| * | Let doctrine generate index names | Robin Appelman | 2015-12-09 | 2 | -7/+1 |
| | | |||||
* | | 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 #21059 from owncloud/remove-deaed-code-mount-config | Thomas Müller | 2015-12-09 | 1 | -52/+6 |
|\ \ \ | | | | | | | | | Remove dead code | ||||
| * | | | Remove dead code | Lukas Reschke | 2015-12-09 | 1 | -52/+6 |
| | | | | | | | | | | | | | | | | Silences two other security warnings, also I cleaned up the PHPDoc a little bit. | ||||
* | | | | Merge pull request #21068 from owncloud/fix-exit-code-autotest-external | Thomas Müller | 2015-12-09 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Fix exit code autotest external | ||||
| * | | | Use default timeout on connection test | Thomas Müller | 2015-12-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #20995 from owncloud/fix-18734 | Thomas Müller | 2015-12-09 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | ensure multiselect always receives an array when setting its value, f… | ||||
| * | | | ensure multiselect always receives an array when setting its value, fixes #18734 | Arthur Schiwon | 2015-12-07 | 1 | -1/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #21003 from owncloud/personal-mount-mountid | Thomas Müller | 2015-12-09 | 2 | -4/+54 |
|\ \ \ | | | | | | | | | Dont set the string storage id to the numeric storage id for personal mounts | ||||
| * | | | Add tests | Robin Appelman | 2015-12-08 | 1 | -0/+50 |
| | | | | |||||
| * | | | Dont set the string storage id to the numeric storage id for personal mounts | Robin Appelman | 2015-12-07 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstore | Thomas Müller | 2015-12-09 | 4 | -22/+41 |
|\ \ \ \ | | | | | | | | | | | Fix (re)share permission checks in a few code paths | ||||
| * | | | | Fix more unit tests to pass a mock storage instead of null to FileInfo | Vincent Petry | 2015-12-08 | 1 | -18/+26 |
| | | | | | |||||
| * | | | | 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. | ||||
| * | | | | Compute share permissions in the view | Vincent Petry | 2015-12-08 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-09 | 14 | -2/+128 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry | Thomas Müller | 2015-12-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | passing an empty base in this diagnosis call will not result in LDAP… | ||||
| * | | | | passing an empty base in this diagnosis call will not result in LDAP errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Neither in "Invalid DN syntax" nor in "Object not found" | ||||
* | | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-08 | 7 | -16/+66 |
|\ \ \ \ \ | | | | | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | | More fixes to the docs | Joas Schilling | 2015-12-08 | 3 | -6/+20 |
| | | | | | | |||||
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 7 | -10/+46 |
| | |/ / / | |/| | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | | Merge pull request #20786 from owncloud/systemtags-dav | Thomas Müller | 2015-12-08 | 15 | -0/+1876 |
|\ \ \ \ \ | |_|/ / / |/| | | | | DAV endpoint for system tags | ||||
| * | | | | Fixed system tags DAV and API and docs | Vincent Petry | 2015-12-04 | 7 | -40/+49 |
| | | | | | |||||
| * | | | | Unit test for system tags plugin | Vincent Petry | 2015-12-03 | 10 | -14/+988 |
| | | | | | |||||
| * | | | | Fix PHPDoc ... | Thomas Müller | 2015-12-03 | 7 | -16/+20 |
| | | | | | |||||
| * | | | | Added dav endpoints for system tags | Vincent Petry | 2015-12-03 | 9 | -0/+889 |
| | | | | | |||||
* | | | | | Use proper PHPDoc reference | Lukas Reschke | 2015-12-08 | 1 | -2/+2 |
| | | | | |