Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More characters are allowed on POSIX systems | Roeland Jago Douma | 2016-02-12 | 1 | -2/+3 |
| | |||||
* | Merge pull request #22334 from owncloud/files_videoplayer_it_is | Thomas Müller | 2016-02-11 | 1 | -1/+1 |
|\ | | | | | Mark files_videoplayer as shipped | ||||
| * | Mark files_videoplayer as shipped | Lukas Reschke | 2016-02-11 | 1 | -1/+1 |
|/ | | | Ref https://github.com/owncloud/files_video_player/pull/27 + https://github.com/owncloud/files_videoplayer/issues/26#issuecomment-182968638 | ||||
* | Merge pull request #22314 from owncloud/fix-mariadb-autotest | Thomas Müller | 2016-02-11 | 2 | -4/+11 |
|\ | | | | | Wait until mariadb is up and running | ||||
| * | Use official mariadb docker | Thomas Müller | 2016-02-11 | 2 | -1/+7 |
| | | |||||
| * | Wait until mariadb is up and running | Thomas Müller | 2016-02-11 | 1 | -3/+4 |
| | | |||||
* | | Merge pull request #22320 from owncloud/files_external-crypt | Thomas Müller | 2016-02-11 | 3 | -5/+35 |
|\ \ | | | | | | | encrypt passwords for files_external | ||||
| * | | encrypt passwords for files_external | Robin Appelman | 2016-02-11 | 3 | -5/+35 |
| | | | |||||
* | | | Merge pull request #22315 from owncloud/update-info-checker-requirements | Thomas Müller | 2016-02-11 | 2 | -13/+6 |
|\ \ \ | | | | | | | | | Update info checker requirements | ||||
| * | | | Update info checker requirements | Joas Schilling | 2016-02-11 | 2 | -13/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #22264 from owncloud/read-version-from-info.xml-only | Thomas Müller | 2016-02-11 | 6 | -19/+6 |
|\ \ \ | | | | | | | | | No longer evaluate appinfo/version | ||||
| * | | | No longer evaluate appinfo/version | Thomas Müller | 2016-02-10 | 6 | -19/+6 |
| | | | | |||||
* | | | | Merge pull request #22322 from owncloud/fix-typo | Thomas Müller | 2016-02-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix typo | ||||
| * | | | | Fix typo | Morris Jobke | 2016-02-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #22307 from ↵ | Thomas Müller | 2016-02-11 | 3 | -4/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remove-notification-on-unshare-and-on-errors Remove notification on unshare and on errors | ||||
| * | | | | | Delete the notification when the owner unshares the remote before the user ↵ | Joas Schilling | 2016-02-11 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | did anything | ||||
| * | | | | | Remove the notification if accepting/declining failed because of 404 | Joas Schilling | 2016-02-11 | 2 | -4/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #22308 from owncloud/shorter-ttl-find-path | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Shorter TTL on findBinaryPath caching | ||||
| * | | | | | Fixes #13658 | Thomas Müller | 2016-02-11 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lock | Thomas Müller | 2016-02-11 | 1 | -5/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | scan the file in the write lock when uploading over dav | ||||
| * | | | | also fix lock order for chunked dav uploads | Robin Appelman | 2016-02-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | scan the file in the write lock when uploading over dav | Robin Appelman | 2016-02-10 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22316 from owncloud/fix_22309 | Morris Jobke | 2016-02-11 | 2 | -3/+10 |
|\ \ \ \ | |_|_|/ |/| | | | Properly check for legacy methods on IShare objects | ||||
| * | | | Properly check for legacy methods | Roeland Jago Douma | 2016-02-11 | 2 | -3/+10 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | The new shares are completely without parents eventually. But for some current legacy reasons the methods are still around. But we should properly check for them. Fixes #22309 | ||||
* | | | Merge pull request #22281 from owncloud/activity-100-unshare-activities | Thomas Müller | 2016-02-11 | 1 | -16/+77 |
|\ \ \ | |_|/ |/| | | Add translations of unshare activities | ||||
| * | | Add translations of unshare activities | Joas Schilling | 2016-02-10 | 1 | -16/+77 |
| |/ | |||||
* | | [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 |