Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 1 | -5/+15 |
|\ | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | ||||
| * | fix unit tests | Morris Jobke | 2015-03-17 | 1 | -5/+15 |
| | | |||||
* | | Merge pull request #15244 from owncloud/use_default_share_folder | Morris Jobke | 2015-03-26 | 3 | -5/+20 |
|\ \ | | | | | | | always fall back to default share folder | ||||
| * | | always fall back to default share folder | Bjoern Schiessle | 2015-03-26 | 3 | -5/+20 |
| | | | |||||
* | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 2 | -20/+192 |
|\ \ \ | |/ / |/| | | Fix share permission checks | ||||
| * | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 1 | -9/+13 |
| | | | |||||
| * | | Rename must be possible with update-only permission | Vincent Petry | 2015-03-19 | 1 | -17/+23 |
| | | | | | | | | | | | | and this as long as the rename is done within the same folder. | ||||
| * | | Fix shared storage permission checks | Vincent Petry | 2015-03-18 | 2 | -4/+166 |
| | | | |||||
* | | | Merge pull request #15001 from owncloud/kill-share-proxy | Thomas Müller | 2015-03-26 | 6 | -76/+23 |
|\ \ \ | | | | | | | | | Replace share proxy with a hook | ||||
| * | | | replace share proxy with hook | Robin Appelman | 2015-03-26 | 6 | -71/+18 |
| | | | | |||||
| * | | | rename proxy test | Robin Appelman | 2015-03-26 | 1 | -7/+7 |
| | | | | |||||
* | | | | Remove IDE autocomplete fail | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
|/ / / | | | | | | | | | | :see_no_evil: *cough* *cough* | ||||
* | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 63 | -510/+1119 |
| | | | |||||
* | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 3 | -27/+15 |
|\ \ \ | | | | | | | | | Add wrapper for Guzzle | ||||
| * | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 3 | -27/+15 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 2 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #15055 from owncloud/share-activity-grouping | Morris Jobke | 2015-03-24 | 1 | -0/+14 |
|\ \ \ | | | | | | | | | Group sharing activities by user/group and file respectively | ||||
| * | | | Group sharing activities by user/group and file respectively | Joas Schilling | 2015-03-20 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-tests | Morris Jobke | 2015-03-24 | 2 | -154/+67 |
|\ \ \ | | | | | | | | | Deduplicate external manager tests | ||||
| * | | | Merge the two tests into one | Joas Schilling | 2015-03-24 | 2 | -154/+67 |
| | | | | |||||
* | | | | Merge pull request #15158 from owncloud/fix-failing-master | Robin Appelman | 2015-03-24 | 2 | -5/+14 |
|\| | | | | | | | | | | | Fix failing master unit tests | ||||
| * | | | *cough* | Joas Schilling | 2015-03-24 | 2 | -5/+14 |
| | | | | |||||
* | | | | Merge pull request #14998 from rullzer/ocs_api_new_url | Morris Jobke | 2015-03-24 | 2 | -2/+6 |
|\ \ \ \ | |/ / / |/| | | | OCS API should return fancy OC url | ||||
| * | | | Added extra unit test | Roeland Jago Douma | 2015-03-21 | 1 | -0/+5 |
| | | | | |||||
| * | | | OCS API should return fancy OC url | Roeland Jago Douma | 2015-03-21 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | * Also use the URLGenerator | ||||
* | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share | Morris Jobke | 2015-03-24 | 4 | -26/+209 |
|\ \ \ \ | | | | | | | | | | | "Integrity constraint violation" when sharing the same item twice with the same user | ||||
| * | | | | Add a unit test for the naming conflict on the mountpoint name | Joas Schilling | 2015-03-17 | 2 | -6/+155 |
| | | | | | |||||
| * | | | | Use insertIfNotExists() instead of manual logic | Joas Schilling | 2015-03-17 | 1 | -24/+31 |
| | | | | | |||||
| * | | | | Correctly get the unique mountpoint name when mounting the share | Joas Schilling | 2015-03-17 | 3 | -10/+37 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Previously the mount name was checked for uniqueness prior to inserting the share. This caused problems, when two shares with the same name where done or folder, mount point, local share with the same name was done, between sending and accepting of the remote share | ||||
* | | | | when the path doesnt exist show a proper error page | Robin Appelman | 2015-03-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-24 | 4 | -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 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-22 | 2 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 3 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | Preview provider registration in manager | ||||
| * | | | | Fix controller test | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Move mimetype check from template to controller | Joas Schilling | 2015-03-16 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Use the PreviewManager where possible | Joas Schilling | 2015-03-16 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Do not automatically add "update" permission to shared mounts | Vincent Petry | 2015-03-20 | 1 | -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 transifex | Jenkins for ownCloud | 2015-03-20 | 2 | -10/+10 |
| | | | | |||||
* | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -0/+18 |
|\ \ \ \ | | | | | | | | | | | Ocs respect enforced date | ||||
| * | | | | Added unit test | Roeland Jago Douma | 2015-03-19 | 1 | -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-share | Robin Appelman | 2015-03-19 | 3 | -2/+144 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix external shares without password on oracle | ||||
| * | | | | Do not make setupMounts() public just because of testing | Joas Schilling | 2015-03-11 | 2 | -12/+12 |
| | | | | | |||||
| * | | | | Add unit tests for external share mananger | Robin Appelman | 2015-03-10 | 2 | -2/+144 |
| | | | | | |||||
| * | | | | Fix external shares without password on oracle | Robin Appelman | 2015-02-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-19 | 2 | -0/+6 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-18 | 4 | -2/+16 |
| | | | | |||||
* | | | | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | \OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching. | ||||
* | | | Fix PHPDoc and Co. | Lukas Reschke | 2015-03-17 | 1 | -4/+12 |
| | | | | | | | | | | | | Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240 | ||||
* | | | Fix scanFile signature warnings | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-12 | 2 | -2/+2 |
| | |