summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | fix a ImageExportPlugin Test (#25215)Georg Ehrke2016-06-272-8/+15
* | | | Merge pull request #281 from nextcloud/update-3rdparty-masterBjörn Schießle2016-07-011-0/+0
|\ \ \ \
| * | | | update to 3rdparty masterMorris Jobke2016-07-011-0/+0
| |/ / /
* | | | Merge pull request #278 from nextcloud/master-traversal-directory-jsBjörn Schießle2016-07-012-2/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Match on 405Lukas Reschke2016-07-012-1/+6
| * | | Match for /../Lukas Reschke2016-07-012-1/+5
| * | | Do not allow directory traversal using "../"Lukas Reschke2016-07-012-1/+5
|/ / /
* | | Merge pull request #255 from nextcloud/dav-permission-checkBjörn Schießle2016-06-304-3/+96
|\ \ \
| * | | fix error messageBjoern Schiessle2016-06-301-1/+1
| * | | Fix testsLukas Reschke2016-06-301-0/+20
| * | | Add proper throws PHP docsLukas Reschke2016-06-301-2/+13
| * | | Add required $message parameterLukas Reschke2016-06-301-2/+2
| * | | Add integration testsLukas Reschke2016-06-302-0/+47
| * | | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-301-1/+16
* | | | Merge pull request #258 from nextcloud/set-dispositionMarius Blüm2016-06-302-2/+7
|\ \ \ \
| * | | | Set content-type to "application/octet-stream"Lukas Reschke2016-06-302-2/+7
| |/ / /
* | | | Merge pull request #253 from nextcloud/fix-versionsMorris Jobke2016-06-301-5/+11
|\ \ \ \ | |/ / / |/| | |
| * | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
|/ / /
* | | Merge pull request #247 from nextcloud/l10n-fixesMorris Jobke2016-06-301-1/+3
|\ \ \
| * | | Fix update notification textMorris Jobke2016-06-291-1/+3
* | | | Merge pull request #206 from nextcloud/ci-mysqlMorris Jobke2016-06-304-6/+32
|\ \ \ \
| * | | | mysql only works with 3 byte UTF-8Morris Jobke2016-06-292-1/+9
| * | | | fix mysql error handlingMorris Jobke2016-06-232-1/+1
| * | | | Add mysql job to CIMorris Jobke2016-06-232-6/+24
* | | | | Merge pull request #248 from nextcloud/tx-fixesMorris Jobke2016-06-291-16/+15
|\ \ \ \ \
| * | | | | Update transifex configMorris Jobke2016-06-291-16/+15
| | |/ / / | |/| | |
* | | | | Merge pull request #245 from nextcloud/fix-243Morris Jobke2016-06-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | targets 3rdparty submodule from Nc instead of oCVincent Chan2016-06-281-1/+1
* | | | | Merge pull request #242 from nextcloud/fix-229Morris Jobke2016-06-292-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | get only vcard which match both the address book id and the vcard uriBjoern Schiessle2016-06-282-1/+6
|/ / / /
* | | | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2842-252/+387
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2742-252/+387
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
| | |\ \ \
| | | * | | Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-0/+4
| | * | | | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| | |\ \ \ \
| | | * | | | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| | * | | | | Merge pull request #25261 from owncloud/app-password-login-nameVincent Petry2016-06-274-2/+28
| | |\ \ \ \ \
| | | * | | | | fix layoutChristoph Wurst2016-06-243-6/+24
| | | * | | | | show which login name to use for the new app passwordChristoph Wurst2016-06-243-0/+8
| | | |/ / / /
| | * | | | | Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsi...Christoph Wurst2016-06-271-0/+3
| | |\ \ \ \ \
| | | * | | | | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| | | |/ / / /
| | * | | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-2710-45/+214
| | |\ \ \ \ \
| | | * | | | | Repair step to adjust link share delete permissionsVincent Petry2016-06-243-1/+111
| | | * | | | | Add explicit delete permission to link sharesVincent Petry2016-06-247-44/+103
| | * | | | | | Merge pull request #25258 from owncloud/integritycheck-whennotinstalledVincent Petry2016-06-271-3/+12
| | |\ \ \ \ \ \
| | | * | | | | | Make code integrity check work when OC is not installed yetVincent Petry2016-06-241-3/+12
| | * | | | | | | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnectMorris Jobke2016-06-271-0/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove tooltip when disconnecting tokenVincent Petry2016-06-231-0/+2
| | * | | | | | | | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-2710-203/+11
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | remove ie8+9 supportHendrik Leppelsack2016-06-2310-203/+11
| | | | |_|_|_|_|/ | | | |/| | | | |