aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-1180-50/+98
|
* 9.0.0 beta 1v9.0beta1C Montero-Luque2016-02-101-2/+2
|
* Merge pull request #22285 from owncloud/fix_22275Thomas Müller2016-02-103-4/+19
|\ | | | | Only show link shares for the current user
| * Also filter the old share info endpointRoeland Jago Douma2016-02-101-1/+5
| | | | | | | | Make sure we do not show an icon if we can't display a share
| * Only show link shares for the current userRoeland Jago Douma2016-02-102-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-webdavdownloadlinkLukas Reschke2016-02-102-7/+4
|\ \ | | | | | | Revert back to non-webdav download link for public URLs
| * | Revert back to non-webdav download link for public URLsVincent Petry2016-02-102-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-authThomas Müller2016-02-103-5/+6
|\ \ | | | | | | Harden updater authentication
| * | Harden updater authenticationLukas Reschke2016-02-103-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üller2016-02-103-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 outJoas Schilling2016-02-103-24/+71
| | | |
* | | | Merge pull request #22271 from owncloud/remember-login-stateThomas Müller2016-02-102-0/+5
|\ \ \ \ | | | | | | | | | | Remember previous state of remember login checkbox
| * | | | refactoring codeVincent Chan2016-02-103-9/+4
| | | | |
| * | | | Remember previous state of remember login checkboxVincent Chan2016-02-102-1/+11
| | | | | | | | | | | | | | | | | | | | fixes #22205
* | | | | Merge pull request #22273 from owncloud/versions-fixpathasrecipientThomas Müller2016-02-102-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix versions path as share recipient when different than owner path
| * | | | Use full path of known file when handling versionsVincent Petry2016-02-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the versions API response, use the known file path when populating version models.
| * | | | Remove path from versions responseVincent Petry2016-02-101-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_encryption2Thomas Müller2016-02-103-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 otherBjoern Schiessle2016-02-103-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 Schiessle2016-02-101-15/+30
| | | | | | | | | | | | | | | | | | | | proper version if we move the file over to the original location
* | | | | Merge pull request #20073 from owncloud/files-should-add-download-dispositionThomas Müller2016-02-101-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 GETThomas Müller2016-02-081-3/+8
| | | | | |
| * | | | | Serve files with an attachment disposition for new DAV endpointLukas Reschke2016-02-081-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-directlyThomas Müller2016-02-101-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use cache directly instead of QueryBuilder
| * | | | | | Use cache directly instead of QBLukas Reschke2016-02-101-5/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | In case somebody does not use oc_filecache
* | | | | | Merge pull request #22274 from owncloud/fix_21710Thomas Müller2016-02-101-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated davclient.js to support MKCOL in edge
| * | | | | | Updated davclient.jsRoeland Jago Douma2016-02-101-1/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fix for MKCOL in edge
* | | | | | Merge pull request #22263 from owncloud/fix-group-principalsThomas Müller2016-02-102-8/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix group principal
| * | | | | Fix group principalThomas Müller2016-02-102-8/+24
| | | | | |
* | | | | | Merge pull request #22266 from owncloud/fix_21726Vincent Petry2016-02-101-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Only show link spinner if the share exists
| * | | | | Only show link spinner if the share existsRoeland Jago Douma2016-02-101-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-sharesThomas Müller2016-02-106-17/+30
|\ \ \ \ \ | |_|_|_|/ |/| | | | Notifications for remote shares
| * | | | Fix oracle by using less quotesJoas Schilling2016-02-101-1/+1
| | | | |
| * | | | Listen to the notification event to reload the file listJoas Schilling2016-02-101-1/+13
| | | | |
| * | | | Mark the accept button as primaryJoas Schilling2016-02-101-1/+2
| | | | |
| * | | | Create the actions with the correct IDJoas Schilling2016-02-102-5/+6
| | | | |
| * | | | Make sure the share ID is an integerJoas Schilling2016-02-101-2/+2
| | | | |
| * | | | Fix action pathsJoas Schilling2016-02-101-2/+2
| | | | |
| * | | | Bring the messages inlineJoas Schilling2016-02-101-1/+1
| | | | |
| * | | | Fix the notification API usageJoas Schilling2016-02-102-1/+6
| | | | |
| * | | | Revert "Disable the remote sharing notifications until they work properly"Joas Schilling2016-02-103-8/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 6bc93c740194d245bb9a7d1f230ed33461f842a7. Conflicts: apps/files_sharing/lib/external/manager.php
* | | | Merge pull request #22256 from owncloud/hide-updater-secretThomas Müller2016-02-101-0/+1
|\ \ \ \ | |/ / / |/| | | Hide updater.secret from occ output by default
| * | | Hide updater.secret from occ output by defaultLukas Reschke2016-02-091-0/+1
| | | | | | | | | | | | | | | | We should not have people post that value to us.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1090-74/+94
| | | |
* | | | Merge pull request #21557 from owncloud/use-hmac-over-encryptionLukas Reschke2016-02-0918-137/+499
|\ \ \ \ | | | | | | | | | | Add integrity protection using Encrypt-Then-MAC to default encryption module
| * | | | Add tests for setVersionLukas Reschke2016-02-091-0/+40
| | | | |
| * | | | Use cache update instead of put for encryption versionVincent Petry2016-02-091-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 testsLukas Reschke2016-02-093-15/+39
| | | | |
| * | | | don't decrease ->version for part files but only a local variable, otherwise ↵Bjoern Schiessle2016-02-091-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 wrapperVincent Petry2016-02-091-2/+5
| | | | |