aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Set content-type to "application/octet-stream"Lukas Reschke2016-06-302-2/+7
* 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
| | * | | | | | | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove a fed share from the local table before trying to notify the remote se...Robin Appelman2016-06-231-2/+2
| | | |/ / / / / /
| | * | | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefixVincent Petry2016-06-273-11/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #25154 from owncloud/token-login-check-loginnameVincent Petry2016-06-272-2/+41
| | |\ \ \ \ \ \ \
| | | * | | | | | | check login name when authenticating with client tokenChristoph Wurst2016-06-242-2/+41
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2710-0/+32
* | | | | | | | | Merge pull request #238 from nextcloud/lgtm-self-approval-fixMorris Jobke2016-06-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Get rid of LGTM self approvals Marius Blüm2016-06-271-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #235 from nextcloud/fix-app-codeMarius Blüm2016-06-279-18/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add app:check-code for already compatible appsMorris Jobke2016-06-279-18/+3
* | | | | | | | | | Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-2720-2/+4066
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Only save when value changed or enter is pressedLukas Reschke2016-06-271-9/+15
| * | | | | | | | | Add tooltipLukas Reschke2016-06-272-6/+7
| * | | | | | | | | Add comment to "getMailHeaderColor"Lukas Reschke2016-06-271-0/+5
| * | | | | | | | | Use stream instead of renameLukas Reschke2016-06-272-14/+45
| * | | | | | | | | Replace OC_Defaults with \OC::$server->getThemingDefaults()Lukas Reschke2016-06-271-6/+1