| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug | Thomas Müller | 2015-03-24 | 1 | -0/+3 |
| |\ | | | | | Log forbidden in debug level | ||||
| | * | Log forbidden in debug level | Vincent Petry | 2015-03-24 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #14949 from owncloud/sabre-2.1.3 | Lukas Reschke | 2015-03-24 | 2 | -1/+2 |
| |\ \ | | | | | | | Update sabre-2.1.3 thirdparty submodule | ||||
| | * | | Update 3rd party ref for sabre 2.1.3 | Vincent Petry | 2015-03-19 | 1 | -0/+0 |
| | | | | |||||
| | * | | Fix Principal connector override | Vincent Petry | 2015-03-17 | 1 | -1/+2 |
| | | | | |||||
| | * | | Update sabre-2.1.3 thirdparty submodule | Vincent Petry | 2015-03-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | 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 #14919 from rullzer/files_thumbnail_fix | Morris Jobke | 2015-03-24 | 3 | -15/+53 |
| |\ \ \ \ \ | | | | | | | | | | | | | Files thumbnail fix | ||||
| | * | | | | | No longer directly output OC_Image for thumbnails | Roeland Jago Douma | 2015-03-24 | 3 | -15/+53 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * Only use public interfaces - Injected IPreview * Added unit tests | ||||
| * | | | | | 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 #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 3 | -0/+57 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add `getNonExistingName()` to the node api | ||||
| | * | | | | | Add `getNonExistingName()` to the node api | Robin Appelman | 2015-03-24 | 3 | -0/+57 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #15112 from owncloud/security-warning-section | Morris Jobke | 2015-03-24 | 3 | -97/+39 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | consolidate all admin warnings and notices into one section | ||||
| | * | | | | | | consolidate all admin warnings and notices into one section | Jan-Christoph Borchardt | 2015-03-24 | 3 | -97/+39 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #15156 from owncloud/file-summary-align | Morris Jobke | 2015-03-24 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | correctly align file list summary when the list has the favorite feature | ||||
| | * | | | | | | | correctly align file list summary when the list has the favorite feature | Jan-Christoph Borchardt | 2015-03-24 | 1 | -0/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #15048 from owncloud/avatar-crop-square | Morris Jobke | 2015-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | round width and height when cropping avatar | ||||
| | * | | | | | | round width and height when cropping avatar | Robin Appelman | 2015-03-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | 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 | ||||
| * | | | | | | Merge pull request #15151 from owncloud/use-local-time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't use hardcoded date and time | ||||
| | * | | | | | | Don't use hardcoded date and time | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Use local time instead. http://momentjs.com/ | ||||
| * | | | | | | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption | Vincent Petry | 2015-03-24 | 1 | -14/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove range header exception for encryption | ||||
| | * | | | | | | | Remove range header exception for encryption | jknockaert | 2015-03-24 | 1 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert #10422 | ||||
| * | | | | | | | | Merge pull request #15127 from owncloud/admin-tips-jenkins | Morris Jobke | 2015-03-24 | 2 | -2/+21 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add Tips & tricks section to admin settings | ||||
| | * | | | | | | | | add Tips & tricks section to admin settings | Jan-Christoph Borchardt | 2015-03-23 | 2 | -2/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #15126 from owncloud/sabre-storagenotavailable | Morris Jobke | 2015-03-24 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Soft fail in CustomPropertiesBackend whenever storage not available | ||||
| | * | | | | | | | | | Soft fail in CustomPropertiesBackend whenever storage not available | Vincent Petry | 2015-03-23 | 2 | -1/+15 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a storage is not available, it will not fail the whole call any more but still return a usable file list. | ||||
| * | | | | | | | | | Merge pull request #15149 from owncloud/fix-enable-for-group | Joas Schilling | 2015-03-24 | 2 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable meth... | ||||
| | * | | | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable method | Joas Schilling | 2015-03-24 | 2 | -2/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #15145 from owncloud/fix-15097-master | Vincent Petry | 2015-03-24 | 5 | -23/+130 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Properly catch whether a share is `null` | ||||
| | * | | | | | | | | | 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 | 5 | -23/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #15143 from owncloud/24h-time-format | Jan-Christoph Borchardt | 2015-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use 24h format instead of 12h format | ||||
| | * | | | | | | | | | | Use 24h format instead of 12h format | Daniel Hansson | 2015-03-24 | 1 | -1/+1 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | Use correct time format in WebUI | ||||
| * | | | | | | | | | | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list | Vincent Petry | 2015-03-24 | 2 | -16/+14 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | 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 objects | Joas Schilling | 2015-03-23 | 2 | -16/+14 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Way quicker | ||||
| * | | | | | | | | | | Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list | Morris Jobke | 2015-03-24 | 7 | -37/+34 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Issue/15138 feedback for empty apps list | ||||
| | * | | | | | | | | | Use the same style when no search result was found | Joas Schilling | 2015-03-24 | 2 | -6/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Do not duplicate the empty content css | Joas Schilling | 2015-03-24 | 2 | -24/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Display a message when no apps can be found for this oc version | Joas Schilling | 2015-03-24 | 3 | -7/+22 |
| | | |_|_|/ / / / / | |/| | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |