aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-12210-360/+328
* Merge pull request #22334 from owncloud/files_videoplayer_it_isThomas Müller2016-02-111-1/+1
|\
| * Mark files_videoplayer as shippedLukas Reschke2016-02-111-1/+1
|/
* Merge pull request #22314 from owncloud/fix-mariadb-autotestThomas Müller2016-02-112-4/+11
|\
| * Use official mariadb dockerThomas Müller2016-02-112-1/+7
| * Wait until mariadb is up and runningThomas Müller2016-02-111-3/+4
* | Merge pull request #22320 from owncloud/files_external-cryptThomas Müller2016-02-113-5/+35
|\ \
| * | encrypt passwords for files_externalRobin Appelman2016-02-113-5/+35
* | | Merge pull request #22315 from owncloud/update-info-checker-requirementsThomas Müller2016-02-112-13/+6
|\ \ \
| * | | Update info checker requirementsJoas Schilling2016-02-112-13/+6
| | |/ | |/|
* | | Merge pull request #22264 from owncloud/read-version-from-info.xml-onlyThomas Müller2016-02-116-19/+6
|\ \ \
| * | | No longer evaluate appinfo/versionThomas Müller2016-02-106-19/+6
* | | | Merge pull request #22322 from owncloud/fix-typoThomas Müller2016-02-111-1/+1
|\ \ \ \
| * | | | Fix typoMorris Jobke2016-02-111-1/+1
* | | | | Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on...Thomas Müller2016-02-113-4/+17
|\ \ \ \ \
| * | | | | Delete the notification when the owner unshares the remote before the user di...Joas Schilling2016-02-111-0/+7
| * | | | | Remove the notification if accepting/declining failed because of 404Joas Schilling2016-02-112-4/+10
| | |_|/ / | |/| | |
* | | | | Merge pull request #22308 from owncloud/shorter-ttl-find-pathThomas Müller2016-02-111-1/+2
|\ \ \ \ \
| * | | | | Fixes #13658Thomas Müller2016-02-111-1/+2
| |/ / / /
* | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lockThomas Müller2016-02-111-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | also fix lock order for chunked dav uploadsRobin Appelman2016-02-101-2/+2
| * | | | scan the file in the write lock when uploading over davRobin Appelman2016-02-101-3/+3
| | |/ / | |/| |
* | | | Merge pull request #22316 from owncloud/fix_22309Morris Jobke2016-02-112-3/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Properly check for legacy methodsRoeland Jago Douma2016-02-112-3/+10
|/ / /
* | | Merge pull request #22281 from owncloud/activity-100-unshare-activitiesThomas Müller2016-02-111-16/+77
|\ \ \ | |_|/ |/| |
| * | Add translations of unshare activitiesJoas Schilling2016-02-101-16/+77
| |/
* | [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
|\ \
| * | Also filter the old share info endpointRoeland Jago Douma2016-02-101-1/+5
| * | Only show link shares for the current userRoeland Jago Douma2016-02-102-3/+14
* | | Merge pull request #22297 from owncloud/public-webdavdownloadlinkLukas Reschke2016-02-102-7/+4
|\ \ \
| * | | Revert back to non-webdav download link for public URLsVincent Petry2016-02-102-7/+4
|/ / /
* | | Merge pull request #22276 from owncloud/harden-updater-authThomas Müller2016-02-103-5/+6
|\ \ \
| * | | Harden updater authenticationLukas Reschke2016-02-103-5/+6
* | | | Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-...Thomas Müller2016-02-103-24/+71
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | refactoring codeVincent Chan2016-02-103-9/+4
| * | | | Remember previous state of remember login checkboxVincent Chan2016-02-102-1/+11
* | | | | Merge pull request #22273 from owncloud/versions-fixpathasrecipientThomas Müller2016-02-102-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use full path of known file when handling versionsVincent Petry2016-02-101-1/+2
| * | | | Remove path from versions responseVincent Petry2016-02-101-0/+5
| | |/ / | |/| |
* | | | Merge pull request #22267 from owncloud/fix_encryption2Thomas Müller2016-02-103-25/+72
|\ \ \ \
| * | | | remember signature version and only set it on update to make sure that otherBjoern Schiessle2016-02-103-12/+44
| * | | | use the version of the original file if we write the part file to have a prop...Bjoern Schiessle2016-02-101-15/+30
* | | | | Merge pull request #20073 from owncloud/files-should-add-download-dispositionThomas Müller2016-02-101-0/+17
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #22270 from owncloud/use-cache-directlyThomas Müller2016-02-101-5/+2
|\ \ \ \ \ \