summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.1.2 RC1v8.1.2RC1C Montero-Luque2015-08-302-3/+3
* Merge pull request #18612 from owncloud/stable8.1-newer-certs-2Morris Jobke2015-08-283-33/+48
|\
| * Use certificates that expire in 10 yearsLukas Reschke2015-08-273-33/+48
* | Merge pull request #18583 from owncloud/backport-of-18582Morris Jobke2015-08-261-2/+2
|\ \ | |/ |/|
| * Remove last occurence of `forcessl`Lukas Reschke2015-08-261-2/+2
|/
* Merge pull request #18579 from owncloud/backport-18279-stable8.1Morris Jobke2015-08-261-1/+3
|\
| * also don't count group members when more than 1 ldap configs are activeArthur Schiwon2015-08-261-1/+3
|/
* Merge pull request #18544 from owncloud/stable8.1-backport-18439Joas Schilling2015-08-261-1/+1
|\
| * [app management] fix dependency check on installMorris Jobke2015-08-251-1/+1
* | Merge pull request #18555 from owncloud/fix-gs-share-stable8.1Morris Jobke2015-08-252-2/+13
|\ \
| * | don't load gs-shareThomas Müller2015-08-251-2/+4
| * | Simply hide sharing buttons for IE8 - fixes #18011Thomas Müller2015-08-252-0/+9
| |/
* | Merge pull request #18559 from owncloud/ext-objectstore-stable8.1Lukas Reschke2015-08-253-2/+34
|\ \ | |/ |/|
| * Prevent objectstore being set from client sideRobin McCorkell2015-08-253-2/+34
|/
* Merge pull request #18446 from owncloud/ext-setuservars-string-stable8.1Morris Jobke2015-08-254-5/+7
|\
| * Retain compatibility with updated storage configurationsRobin McCorkell2015-08-202-3/+3
| * setUserVars() should only attempt substitution with stringsRobin McCorkell2015-08-204-5/+7
* | Merge pull request #18487 from owncloud/add-cors-header-to-allow-client-based...Morris Jobke2015-08-241-0/+1
|\ \ | |/ |/|
| * [stable8.1] Add CORS header to status.php to allow client-based check in the ...Lukas Reschke2015-08-221-0/+1
|/
* Merge pull request #18431 from owncloud/add-warning-ca-bundle-stable8.1Morris Jobke2015-08-191-0/+7
|\
| * Add warning for not existing CA bundle when updatingLukas Reschke2015-08-191-0/+7
* | Merge pull request #18353 from owncloud/backport-block-autocompleteMorris Jobke2015-08-193-0/+16
|\ \ | |/ |/|
| * Add option to disable autocomplete in share dialogMorris Jobke2015-08-173-0/+16
* | Merge pull request #18397 from owncloud/smb-1.0.4-81Thomas Müller2015-08-1922-1017/+136
|\ \
| * | update icewind/smb to 1.0.4Robin Appelman2015-08-1811-43/+99
| * | update icewind/smb to 1.0.3Robin Appelman2015-08-1818-998/+61
|/ /
* | Merge pull request #18367 from owncloud/config-php-tyops-8-1Robin McCorkell2015-08-171-11/+11
|\ \ | |/ |/|
| * typo fixesCarla Schroder2015-08-171-11/+11
|/
* Merge pull request #18182 from owncloud/backport-18159-stable8.1Morris Jobke2015-08-161-0/+4
|\
| * Update installer.phpmichag862015-08-101-0/+1
| * Check if archive contains a directory named like appidmichag862015-08-101-0/+3
* | Merge pull request #18274 from owncloud/issue-18261-sharing-capabilities-use-...Thomas Müller2015-08-142-16/+16
|\ \
| * | Fix config map provider for testsJoas Schilling2015-08-131-11/+11
| * | Fix default values of sharing capabilitiesJoas Schilling2015-08-131-5/+5
* | | Merge pull request #18277 from owncloud/stable8.1-17852Morris Jobke2015-08-144-12/+28
|\ \ \
| * | | add test for factoriesBernhard Posselt2015-08-134-12/+28
| |/ /
* | | Merge pull request #18284 from owncloud/stable8.1-backport-17785Jan-Christoph Borchardt2015-08-131-1/+2
|\ \ \
| * | | fix mobile scrolling, lower sidebar sensitivity, fix #11193Jan-Christoph Borchardt2015-08-131-1/+2
* | | | Merge pull request #18288 from owncloud/stable8.1-backport-18231Jan-Christoph Borchardt2015-08-131-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Show strage full warning for shared storages temporaryMorris Jobke2015-08-131-3/+2
|/ / /
* | | Merge pull request #18257 from owncloud/stable8.1-backport-17680Morris Jobke2015-08-131-1/+4
|\ \ \
| * | | handle rmdir on files for ftp storagesRobin Appelman2015-08-131-1/+4
| |/ /
* | | Merge pull request #18237 from owncloud/backport-scanfilesignatureThomas Müller2015-08-132-1/+84
|\ \ \
| * | | Add a basic unit test which notifies us about incompatible extendingJoas Schilling2015-08-131-0/+82
| * | | Fix duplicated line in doc blockJoas Schilling2015-08-121-1/+0
| * | | Fix scanFile signature to avoid boring warningVincent Petry2015-08-121-1/+3
| |/ /
* | | Merge pull request #18266 from owncloud/stable8.1-filelist-emptycontentduring...Jan-Christoph Borchardt2015-08-131-0/+1
|\ \ \ | |/ / |/| |
| * | Make sure to hide empty content message when mask is shownVincent Petry2015-08-131-0/+1
|/ /
* | Merge pull request #17753 from oparoz/fix-previews-for-public-uploadsVincent Petry2015-08-122-13/+15
|\ \
| * | Fix preview of old file on public upload conflictsOlivier Paroz2015-07-202-13/+15