aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15145 from owncloud/fix-15097-masterVincent Petry2015-03-244-23/+87
|\ | | | | Properly catch whether a share is `null`
| * when the path doesnt exist show a proper error pageRobin Appelman2015-03-241-0/+2
| |
| * Properly catch whether a share is `null`Lukas Reschke2015-03-244-23/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097
* | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-listVincent Petry2015-03-241-14/+11
|\ \ | | | | | | Do not walk over the users directory, but over the list of tagged objects
| * | Do not walk over the users directory, but over the list of tagged objectsJoas Schilling2015-03-231-14/+11
| | | | | | | | | | | | Way quicker
* | | Do not duplicate the empty content cssJoas Schilling2015-03-242-24/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-248-0/+32
| | |
* | | Merge pull request #15123 from owncloud/fix_14098blizzz2015-03-232-1/+15
|\ \ \ | |_|/ |/| | offset needs to be considered in computed limit
| * | offset needs to be considered in computed limitArthur Schiwon2015-03-232-1/+15
| | |
* | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefoxLukas Reschke2015-03-231-0/+9
|\ \ \ | | | | | | | | Show message if upload of folder isn't allowed
| * | | Show message if upload of folder isn't allowedMorris Jobke2015-02-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * current firefox doesn't throw an exception anymore * it just reads 0 bytes -> folder or empty file * upload of folder or empty file isn't supported in every browser except Chrome * fixes #13940
* | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warningsMorris Jobke2015-03-234-10/+37
|\ \ \ \ | |_|/ / |/| | | fix PHP warnings when using occ with some LDAP commands
| * | | fix PHP warnings when using occ with some LDAP commandsArthur Schiwon2015-03-234-10/+37
| | | |
* | | | Merge pull request #14383 from jknockaert/newbranchClark Tomlinson2015-03-231-130/+160
|\ \ \ \ | |/ / / |/| | | make encryption stream wrapper seekable
| * | | againjknockaert2015-02-191-36/+0
| | | |
| * | | try againjknockaert2015-02-191-0/+36
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master'jknockaert2015-02-195-4/+21
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/stream.php
| | | * | | OC8 versionjknockaert2015-02-191-196/+170
| | | | | |
| | | * | | update enc streamjknockaert2014-12-171-136/+161
| | | | | |
| | * | | | backjknockaert2015-02-191-35/+34
| | | | | |
| * | | | | new tryjknockaert2015-02-191-130/+160
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-238-2/+18
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2222-0/+52
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-214-0/+4
| | | | | |
* | | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-managerThomas Müller2015-03-203-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Preview provider registration in manager
| * | | | | | Fix controller testJoas Schilling2015-03-161-0/+1
| | | | | | |
| * | | | | | Move mimetype check from template to controllerJoas Schilling2015-03-162-4/+4
| | | | | | |
| * | | | | | Use the PreviewManager where possibleJoas Schilling2015-03-161-2/+2
| | | | | | |
* | | | | | | Merge pull request #11884 from owncloud/ext-appframeworkVincent Petry2015-03-2030-488/+4309
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleanup ext storage CRUD code, introduce storage config id
| * | | | | | | Introduce async status checkingRobin McCorkell2015-03-203-10/+9
| | | | | | | |
| * | | | | | | Fix PHPDoc in files_external, add missing tagVincent Petry2015-03-178-25/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various PHPDoc issues in external storage app. Added missing NoAdminRequired tag
| * | | | | | | Fix storage priority in JS unit testVincent Petry2015-03-161-3/+6
| | | | | | | |
| * | | | | | | Fix PHPDoc for StoragesControllerVincent Petry2015-03-161-6/+9
| | | | | | | |
| * | | | | | | Generate storage config ids when missingVincent Petry2015-03-168-43/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading in old mount.json files, they do not contain config ids. Since these are needed to be able to use the UI and the new service classes, these will be generated automatically. The config grouping is based on a config hash.
| * | | | | | | Fix mount config unit testsVincent Petry2015-03-132-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix expected result now that it returns the status. Added isset for some properties that are not always present.
| * | | | | | | Mount options for ext storage are now passed aroundVincent Petry2015-03-1313-6/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mount options are now passed to the UI and stored in a hidden field. The ext storage controllers and services also know how to load/save them from the legacy config.
| * | | | | | | Implement priority on client side in hidden inputRobin McCorkell2015-03-122-0/+15
| | | | | | | |
| * | | | | | | Use storage id + appframework for ext storage CRUDVincent Petry2015-03-1227-454/+3796
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added StorageConfig class to replace ugly arrays - Implemented StorageService and StorageController for Global and User storages - Async status checking for storages (from Xenopathic) - Auto-generate id for external storage configs (not the same as storage_id) - Refactor JS classes for external storage settings, this mostly moves/encapsulated existing global event handlers into the MountConfigListView class. - Added some JS unit tests for the external storage UI
* | | | | | | | Do not automatically add "update" permission to shared mountsVincent Petry2015-03-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past it seems the update permission was needed to be able to rename shared mounts, but it doesn't seem to be the case any more. Removing the "update" permission that used to be added automatically fixes the read-only permission check when trying to overwrite a read-only file over WebDAV.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2016-48/+58
| | | | | | | |
* | | | | | | | Merge pull request #14946 from owncloud/dropbox-root-fixThomas Müller2015-03-191-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix root request path for Dropbox
| * | | | | | | | Fix root request path for DropboxVincent Petry2015-03-171-1/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_dateThomas Müller2015-03-191-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ocs respect enforced date
| * | | | | | | | | Added unit testRoeland Jago Douma2015-03-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests added to make sure that removing an expire date when this is enforced is not allowed.
* | | | | | | | | | Merge pull request #14537 from owncloud/oci-external-shareRobin Appelman2015-03-193-2/+144
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix external shares without password on oracle
| * | | | | | | | | Do not make setupMounts() public just because of testingJoas Schilling2015-03-112-12/+12
| | | | | | | | | |
| * | | | | | | | | Add unit tests for external share manangerRobin Appelman2015-03-102-2/+144
| | | | | | | | | |
| * | | | | | | | | Fix external shares without password on oracleRobin Appelman2015-02-271-1/+1
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1918-8/+24
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1830-16/+72
| | | | | | | | |