summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Backport of #17723 to stable8Arthur Schiwon2015-07-202-125/+133
| | | | | | fix runtime caching in ldap's user manager, fixes #17631 fix indentation. no code changes, whitespace only.
* Merge pull request #17688 from ↵Thomas Müller2015-07-205-12/+12
|\ | | | | | | | | owncloud/stable8-publiclinksystemwidemountwithapplicable [stable8] Pass owner to isSystemWideMountPoint to make it work for public links
| * Pass owner to isSystemWideMountPoint to make it work for public linksVincent Petry2015-07-165-12/+12
| | | | | | | | | | | | | | Public links did not have the correct owner so could not properly detect system wide mount points. This is a manual backport of b25c06f5769fbcd90a780cbce90998a38c112043 from 8.1
* | Merge pull request #16019 from owncloud/backport-15486Joas Schilling2015-07-162-4/+134
|\ \ | | | | | | [stable8] Keep fileid when restoring version, using stream copy
| * | Fix version rollback to keep fileidVincent Petry2015-06-172-4/+134
| | |
* | | Merge pull request #17340 from owncloud/stable8-backport-16911Robin McCorkell2015-07-151-2/+4
|\ \ \ | | | | | | | | [stable8] Determine the size we need before asking for a thumbnail
| * | | floats are not welcome when setting the size of a previewOlivier Paroz2015-07-021-4/+4
| | | |
| * | | Determine the size we need before asking for a thumbnailOlivier Paroz2015-07-021-0/+2
| | | | | | | | | | | | | | | | We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
* | | | Merge pull request #17415 from owncloud/fix-ldap-port-field-sizeRobin McCorkell2015-07-131-3/+5
|\ \ \ \ | | | | | | | | | | [stable8] LDAP: make sure port input box is not getting too small on low width
| * | | | LDAP: make sure port input box is not getting too small on low widthArthur Schiwon2015-07-061-3/+5
| | |_|/ | |/| |
* | | | Merge pull request #16369 from owncloud/stable8-share-moveversionsproperlyMorris Jobke2015-07-092-31/+169
|\ \ \ \ | | | | | | | | | | [stable8] Fix version rename with files and folders
| * | | | Fix version rename with files and foldersVincent Petry2015-06-162-31/+169
| | |_|/ | |/| | | | | | | | | | | | | | - fix moving folder into another folder - fix moving file or folder into shared folder as recipient
* | | | Merge pull request #17271 from owncloud/stable8-share-etag-update-targetMorris Jobke2015-07-082-10/+38
|\ \ \ \ | | | | | | | | | | Stable8 share etag update target
| * | | | Unit test for etag update on custom share folderVincent Petry2015-07-011-8/+36
| | | | |
| * | | | take share target into account when updating recipient etagsRobin Appelman2015-07-011-2/+2
| | |_|/ | |/| |
* | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
| |_|/ |/| |
* | | Merge pull request #17318 from owncloud/stable8-clean-ocsidMorris Jobke2015-07-026-6/+6
|\ \ \ | | | | | | | | [stable8] Delete OCS ID from DB if none is specified
| * | | Bump versionsLukas Reschke2015-07-026-6/+6
| |/ /
* / / [stable8] Remove OCS IDsLukas Reschke2015-07-026-7/+0
|/ / | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* | Added unit test to verify link password removealRoeland Jago Douma2015-06-251-1/+23
| |
* | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
| | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | Merge pull request #17033 from owncloud/backport-16890-stable8Morris Jobke2015-06-232-6/+10
|\ \ | | | | | | Backport of #16890 to stable8
| * | Backport of #16890 to stable8Arthur Schiwon2015-06-182-6/+10
| | | | | | | | | | | | | | | | | | the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway delete user test to take getHome into account to ensure it is also deleted subsequently
* | | Merge pull request #16731 from ↵Thomas Müller2015-06-232-9/+127
|\ \ \ | | | | | | | | | | | | | | | | owncloud/stable8-trash-deleteasrecipientkeepversions [stable8] Keep versions when deleting as recipient
| * | | Register sharing hooks in trashbin testsVincent Petry2015-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | Register sharing hooks to make sure that the share mount points are mounted properly, as required by the share-related trashbin tests.
| * | | Keep versions when deleting as recipientVincent Petry2015-06-032-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.
* | | | Merge pull request #16579 from owncloud/stable8-cors-no-cookie-authThomas Müller2015-06-221-2/+0
|\ \ \ \ | | | | | | | | | | Disallow cookie auth for cors requests stable8
| * | | | disallow cookie auth for cors requestsBernhard Posselt2015-05-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app
* | | | | Merge pull request #17001 from owncloud/fix_15664Thomas Müller2015-06-221-2/+6
|\ \ \ \ \ | | | | | | | | | | | | only try to determine unencrypted size if a encrypted file is read
| * | | | | only try to determine unencrypted size if a encrypted file is readBjoern Schiessle2015-06-171-2/+6
| | |/ / / | |/| | |
* | | | | Verify if path existsLukas Reschke2015-06-181-0/+4
| |_|/ / |/| | | | | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* | | | Merge pull request #16627 from owncloud/stable8-multiselectsaveraceconditionblizzz2015-06-171-3/+18
|\ \ \ \ | | | | | | | | | | [stable8] Fix LDAP wizard saveMultiSelect race condition
| * | | | save multiselect box on close, not on click. Makes it less frequent and less ↵Arthur Schiwon2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | prone to race conditions
| * | | | Fix LDAP wizard saveMultiSelect race conditionVincent Petry2015-06-011-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a checkbox is ticked in a multiselect box, it will trigger the saving and retrieving ajax calls at the same time. This fix makes sure that it will first save, and only once saving is done, do the call that retrieves the filter.
* | | | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| | | | |
* | | | | Verify if path existsLukas Reschke2015-06-171-0/+5
| |_|_|/ |/| | | | | | | | | | | We need to verify if the specified path exists to gracefully prevent errors.
* | | | Merge pull request #16744 from owncloud/backport-15260Vincent Petry2015-06-161-1/+6
|\ \ \ \ | | | | | | | | | | [stable8] Backport scrollbar fixes
| * | | | adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-06-041-1/+6
| | |/ / | |/| |
* | | | Merge pull request #16862 from owncloud/use-single-actionThomas Müller2015-06-111-3/+3
|\ \ \ \ | | | | | | | | | | [stable8] Don't use command concatenation
| * | | | Don't use command concatenationLukas Reschke2015-06-101-3/+3
| | | | | | | | | | | | | | | | | | | | Possibly fixes https://github.com/owncloud/core/issues/16853
* | | | | Disable video preview if previews are disabledMorris Jobke2015-06-103-1/+3
|/ / / /
* | | | Merge pull request #16758 from owncloud/backport-16748-stable8Morris Jobke2015-06-101-13/+21
|\ \ \ \ | | | | | | | | | | Backport stable8: port detection needs to take care of now thrown exceptions when LDAP …
| * | | | port detection needs to take care of now thrown exceptions when LDAP server ↵Arthur Schiwon2015-06-051-13/+21
| |/ / / | | | | | | | | | | | | is not available
* | | | Merge pull request #16738 from rullzer/ocs_set_password_backportMorris Jobke2015-06-091-34/+9
|\ \ \ \ | | | | | | | | | | [stable8] Set password properly in OCS Share API
| * | | | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-06-031-34/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | - Added setPassword to share.php - Fixed OCS API call - Added unit tests
* / / / Check if arrayLukas Reschke2015-06-021-5/+7
|/ / / | | | | | | | | | | | | | | | The great library that we use apparently uses mixed types for everything because :see_no_evil: Fixes https://github.com/owncloud/core/issues/16679
* | | Disallow semicolons in passed commandsLukas Reschke2015-06-011-0/+5
| | |
* | | Ensure that passed argument is always a stringLukas Reschke2015-06-011-1/+1
| | | | | | | | | | | | | | | | | | Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour. Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
* | | Revert custom patch that can cause problemsLukas Reschke2015-06-011-2/+8
|/ /
* | Merge pull request #16462 from owncloud/stable8-backport-16444Thomas Müller2015-05-261-1/+1
|\ \ | | | | | | [stable8] Closes "New" dropdown when switching category