summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Fix mount type root detectionVincent Petry2015-12-142-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 transifexJenkins for ownCloud2015-12-138-2/+36
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-1286-0/+150
|
* Merge pull request #21153 from owncloud/files-deleteactiontextThomas Müller2015-12-113-5/+49
|\ | | | | Bring back file delete action text to be based on context
| * Bring back file delete action text to be based on contextVincent Petry2015-12-113-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 inRobin Appelman2015-12-111-2/+5
| |
* | Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
|/
* Merge pull request #21144 from owncloud/dav-auth-checkduplicateheaderThomas Müller2015-12-111-1/+1
|\ | | | | Properly check X-Requested-With header in case of multiple values
| * Properly check X-Requested-With header in case of multiple valuesVincent Petry2015-12-111-1/+1
| | | | | | | | Saw this happening in IE8...
* | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-113-111/+9
|\ \ | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities
| * | Use PHP polyfillsLukas Reschke2015-12-113-111/+9
| | |
* | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-1110-9/+38
|\ \ \ | | | | | | | | Scrutinizer Auto-Fixes
| * | | adjust PHPDocThomas Müller2015-12-102-0/+4
| | | |
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-1010-9/+34
| |/ / | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* / / Catch exception when querying direct download linkVincent Petry2015-12-102-3/+33
|/ /
* | Merge pull request #21114 from owncloud/group-propagation-testsThomas Müller2015-12-104-78/+215
|\ \ | |/ |/| Add test case for group share propagation
| * Add test case for group share propagationRobin Appelman2015-12-104-78/+215
| |
* | Deduplicate version expire jobsMorris Jobke2015-12-102-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-masterThomas Müller2015-12-102-4/+283
|\ | | | | Looks like ceph requires more time to come up ....
| * Looks like ceph requires more time to come up ....Thomas Müller2015-12-092-4/+283
| | | | | | | | | | | | Use sed - not replace apply btrfs hack
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-108-0/+54
| |
* | Merge pull request #21077 from owncloud/external-index-namesThomas Müller2015-12-092-7/+1
|\ \ | |/ |/| Let doctrine generate index names for files_external
| * Let doctrine generate index namesRobin Appelman2015-12-092-7/+1
| |
* | 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 #21059 from owncloud/remove-deaed-code-mount-configThomas Müller2015-12-091-52/+6
|\ \ \ | | | | | | | | Remove dead code
| * | | Remove dead codeLukas Reschke2015-12-091-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-externalThomas Müller2015-12-091-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix exit code autotest external
| * | | Use default timeout on connection testThomas Müller2015-12-091-1/+1
| | | |
* | | | Merge pull request #20995 from owncloud/fix-18734Thomas Müller2015-12-091-1/+5
|\ \ \ \ | |/ / / |/| | | ensure multiselect always receives an array when setting its value, f…
| * | | ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-071-1/+5
| | |/ | |/|
* | | Merge pull request #21003 from owncloud/personal-mount-mountidThomas Müller2015-12-092-4/+54
|\ \ \ | | | | | | | | Dont set the string storage id to the numeric storage id for personal mounts
| * | | Add testsRobin Appelman2015-12-081-0/+50
| | | |
| * | | Dont set the string storage id to the numeric storage id for personal mountsRobin Appelman2015-12-071-4/+4
| | | |
* | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstoreThomas Müller2015-12-094-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 FileInfoVincent Petry2015-12-081-18/+26
| | | | |
| * | | | 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.
| * | | | Compute share permissions in the viewVincent Petry2015-12-081-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 transifexJenkins for ownCloud2015-12-0914-2/+128
| |_|_|/ |/| | |
* | | | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entryThomas Müller2015-12-081-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 errorsArthur Schiwon2015-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | Neither in "Invalid DN syntax" nor in "Object not found"
* | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-087-16/+66
|\ \ \ \ \ | | | | | | | | | | | | Scrutinizer Auto-Fixes
| * | | | | More fixes to the docsJoas Schilling2015-12-083-6/+20
| | | | | |
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-077-10/+46
| | |/ / / | |/| | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-0815-0/+1876
|\ \ \ \ \ | |_|/ / / |/| | | | DAV endpoint for system tags
| * | | | Fixed system tags DAV and API and docsVincent Petry2015-12-047-40/+49
| | | | |
| * | | | Unit test for system tags pluginVincent Petry2015-12-0310-14/+988
| | | | |
| * | | | Fix PHPDoc ...Thomas Müller2015-12-037-16/+20
| | | | |
| * | | | Added dav endpoints for system tagsVincent Petry2015-12-039-0/+889
| | | | |
* | | | | Use proper PHPDoc referenceLukas Reschke2015-12-081-2/+2
| | | | |