Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-11 | 80 | -50/+98 |
| | |||||
* | 9.0.0 beta 1v9.0beta1 | C Montero-Luque | 2016-02-10 | 1 | -2/+2 |
| | |||||
* | Merge pull request #22285 from owncloud/fix_22275 | Thomas Müller | 2016-02-10 | 3 | -4/+19 |
|\ | | | | | Only show link shares for the current user | ||||
| * | Also filter the old share info endpoint | Roeland Jago Douma | 2016-02-10 | 1 | -1/+5 |
| | | | | | | | | Make sure we do not show an icon if we can't display a share | ||||
| * | Only show link shares for the current user | Roeland Jago Douma | 2016-02-10 | 2 | -3/+14 |
| | | | | | | | | | | | | | | Currently we have no way to display multiple links in the UI. So just display the link share for the current user. Fixes #22275 | ||||
* | | Merge pull request #22297 from owncloud/public-webdavdownloadlink | Lukas Reschke | 2016-02-10 | 2 | -7/+4 |
|\ \ | | | | | | | Revert back to non-webdav download link for public URLs | ||||
| * | | Revert back to non-webdav download link for public URLs | Vincent Petry | 2016-02-10 | 2 | -7/+4 |
|/ / | | | | | | | | | Fixes issues with browsers not happy with the token. Fixes activities which were not sent. | ||||
* | | Merge pull request #22276 from owncloud/harden-updater-auth | Thomas Müller | 2016-02-10 | 3 | -5/+6 |
|\ \ | | | | | | | Harden updater authentication | ||||
| * | | Harden updater authentication | Lukas Reschke | 2016-02-10 | 3 | -5/+6 |
| | | | | | | | | | | | | | | | - Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453 - Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;) | ||||
* | | | Merge pull request #22269 from ↵ | Thomas Müller | 2016-02-10 | 3 | -24/+71 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup Chunk the cleanup queries to make sure they don't time out | ||||
| * | | | Chunk the queries to make sure they don't time out | Joas Schilling | 2016-02-10 | 3 | -24/+71 |
| | | | | |||||
* | | | | Merge pull request #22271 from owncloud/remember-login-state | Thomas Müller | 2016-02-10 | 2 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | Remember previous state of remember login checkbox | ||||
| * | | | | refactoring code | Vincent Chan | 2016-02-10 | 3 | -9/+4 |
| | | | | | |||||
| * | | | | Remember previous state of remember login checkbox | Vincent Chan | 2016-02-10 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | fixes #22205 | ||||
* | | | | | Merge pull request #22273 from owncloud/versions-fixpathasrecipient | Thomas Müller | 2016-02-10 | 2 | -1/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix versions path as share recipient when different than owner path | ||||
| * | | | | Use full path of known file when handling versions | Vincent Petry | 2016-02-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the versions API response, use the known file path when populating version models. | ||||
| * | | | | Remove path from versions response | Vincent Petry | 2016-02-10 | 1 | -0/+5 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path attribute contains the path relative to the owner's home folder, not the one from the recipient, which is useless for the client and needlessly discloses the owner's original path. The requested already has access to the full path of the file, so no need to add it to the response. | ||||
* | | | | Merge pull request #22267 from owncloud/fix_encryption2 | Thomas Müller | 2016-02-10 | 3 | -25/+72 |
|\ \ \ \ | | | | | | | | | | | calculate and update the version of the encryption signature correctly | ||||
| * | | | | remember signature version and only set it on update to make sure that other | Bjoern Schiessle | 2016-02-10 | 3 | -12/+44 |
| | | | | | | | | | | | | | | | | | | | | apps like files_versions still get the old signature version | ||||
| * | | | | use the version of the original file if we write the part file to have a ↵ | Bjoern Schiessle | 2016-02-10 | 1 | -15/+30 |
| | | | | | | | | | | | | | | | | | | | | proper version if we move the file over to the original location | ||||
* | | | | | Merge pull request #20073 from owncloud/files-should-add-download-disposition | Thomas Müller | 2016-02-10 | 1 | -0/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Serve files with an attachment disposition for new DAV endpoint | ||||
| * | | | | | Only set the header if the node exists and in case the request is a GET | Thomas Müller | 2016-02-08 | 1 | -3/+8 |
| | | | | | | |||||
| * | | | | | Serve files with an attachment disposition for new DAV endpoint | Lukas Reschke | 2016-02-08 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a `Content-Disposition: attachment` header to all files served via the DAV endpoint. | ||||
* | | | | | | Merge pull request #22270 from owncloud/use-cache-directly | Thomas Müller | 2016-02-10 | 1 | -5/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use cache directly instead of QueryBuilder | ||||
| * | | | | | | Use cache directly instead of QB | Lukas Reschke | 2016-02-10 | 1 | -5/+2 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | In case somebody does not use oc_filecache | ||||
* | | | | | | Merge pull request #22274 from owncloud/fix_21710 | Thomas Müller | 2016-02-10 | 1 | -1/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updated davclient.js to support MKCOL in edge | ||||
| * | | | | | | Updated davclient.js | Roeland Jago Douma | 2016-02-10 | 1 | -1/+7 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Fix for MKCOL in edge | ||||
* | | | | | | Merge pull request #22263 from owncloud/fix-group-principals | Thomas Müller | 2016-02-10 | 2 | -8/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix group principal | ||||
| * | | | | | Fix group principal | Thomas Müller | 2016-02-10 | 2 | -8/+24 |
| | | | | | | |||||
* | | | | | | Merge pull request #22266 from owncloud/fix_21726 | Vincent Petry | 2016-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Only show link spinner if the share exists | ||||
| * | | | | | Only show link spinner if the share exists | Roeland Jago Douma | 2016-02-10 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | If there is no share to delete do not set the spinner. Fixes #21726 | ||||
* | | | | | Merge pull request #22253 from owncloud/notifications-for-remote-shares | Thomas Müller | 2016-02-10 | 6 | -17/+30 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Notifications for remote shares | ||||
| * | | | | Fix oracle by using less quotes | Joas Schilling | 2016-02-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Listen to the notification event to reload the file list | Joas Schilling | 2016-02-10 | 1 | -1/+13 |
| | | | | | |||||
| * | | | | Mark the accept button as primary | Joas Schilling | 2016-02-10 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Create the actions with the correct ID | Joas Schilling | 2016-02-10 | 2 | -5/+6 |
| | | | | | |||||
| * | | | | Make sure the share ID is an integer | Joas Schilling | 2016-02-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix action paths | Joas Schilling | 2016-02-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Bring the messages inline | Joas Schilling | 2016-02-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix the notification API usage | Joas Schilling | 2016-02-10 | 2 | -1/+6 |
| | | | | | |||||
| * | | | | Revert "Disable the remote sharing notifications until they work properly" | Joas Schilling | 2016-02-10 | 3 | -8/+2 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6bc93c740194d245bb9a7d1f230ed33461f842a7. Conflicts: apps/files_sharing/lib/external/manager.php | ||||
* | | | | Merge pull request #22256 from owncloud/hide-updater-secret | Thomas Müller | 2016-02-10 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Hide updater.secret from occ output by default | ||||
| * | | | Hide updater.secret from occ output by default | Lukas Reschke | 2016-02-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | We should not have people post that value to us. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-10 | 90 | -74/+94 |
| | | | | |||||
* | | | | Merge pull request #21557 from owncloud/use-hmac-over-encryption | Lukas Reschke | 2016-02-09 | 18 | -137/+499 |
|\ \ \ \ | | | | | | | | | | | Add integrity protection using Encrypt-Then-MAC to default encryption module | ||||
| * | | | | Add tests for setVersion | Lukas Reschke | 2016-02-09 | 1 | -0/+40 |
| | | | | | |||||
| * | | | | Use cache update instead of put for encryption version | Vincent Petry | 2016-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saves a call to fetch the file id which didn't even work for a reason. This fix properly sets the version in the database. | ||||
| * | | | | Use cache and add tests | Lukas Reschke | 2016-02-09 | 3 | -15/+39 |
| | | | | | |||||
| * | | | | don't decrease ->version for part files but only a local variable, otherwise ↵ | Bjoern Schiessle | 2016-02-09 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | it can happen that we decrease it twice and end up with the wrong value | ||||
| * | | | | Check if partial cache entry or not in encryption wrapper | Vincent Petry | 2016-02-09 | 1 | -2/+5 |
| | | | | |