aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20932 from nextcloud/Valdnet-patch-3Morris Jobke2020-05-131-1/+1
|\
| * l10n: Addition of "The"Valdnet2020-05-131-1/+1
| * l10n: Changing the word "These" to "Following"Valdnet2020-05-111-1/+1
* | Merge pull request #20956 from nextcloud/Valdnet-patch-4Morris Jobke2020-05-131-1/+1
|\ \
| * | Adding "The" to the descriptionValdnet2020-05-131-1/+1
* | | Merge pull request #20958 from nextcloud/bugfix/talk-3523/allow-links-to-conv...Morris Jobke2020-05-131-0/+6
|\ \ \
| * | | Allow links to conversationsJoas Schilling2020-05-131-0/+6
| |/ /
* | | Merge pull request #20952 from nextcloud/test/noid/fix-lint-exit-codeMorris Jobke2020-05-132-2/+2
|\ \ \
| * | | Fix return code of AppConfig::deleteUserValueMorris Jobke2020-05-131-1/+1
| * | | Respect exit code of lint run - changed from -exec to xargs as this exits pro...Morris Jobke2020-05-131-1/+1
| |/ /
* | | Merge pull request #20905 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2020-05-1312-84/+84
|\ \ \ | |/ / |/| |
| * | Bump @babel/preset-env from 7.9.5 to 7.9.6dependabot-preview[bot]2020-05-1312-84/+84
|/ /
* | Merge pull request #20951 from nextcloud/fix/no_trailing_comma_functionRoeland Jago Douma2020-05-131-1/+1
|\ \
| * | Trailing comma's in functin arguments break on 7.2Roeland Jago Douma2020-05-131-1/+1
* | | Merge pull request #20946 from nextcloud/enhancement/ext-json-composerChristoph Wurst2020-05-132-2/+7
|\ \ \ | |/ / |/| |
| * | Declare ext-json as dependency in composer.jsonChristoph Wurst2020-05-132-2/+7
* | | Merge pull request #20939 from nextcloud/enh/middleware/not_modifiedRoeland Jago Douma2020-05-139-61/+169
|\ \ \
| * | | Move the notmodified check to middleware where it belongsRoeland Jago Douma2020-05-139-61/+169
* | | | Merge pull request #20897 from nextcloud/bugfix/httpcacheRoeland Jago Douma2020-05-132-6/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix http cache testClement Wong2020-05-121-1/+1
| * | | Add public argument to Http cacheFor()Clement Wong2020-05-101-5/+4
| * | | Proxy server could cache http response when it is not privateClement Wong2020-05-101-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-1322-0/+38
* | | | Merge pull request #20943 from nextcloud/enh/avatar-cache-1dayMorris Jobke2020-05-121-2/+2
|\ \ \ \
| * | | | Cache the avatar for a dayRoeland Jago Douma2020-05-121-2/+2
|/ / / /
* | | | Merge pull request #20933 from nextcloud/enh/default_password_conf_form_to_postMorris Jobke2020-05-121-1/+1
|\ \ \ \
| * | | | Move the password confirmation form template to postRoeland Jago Douma2020-05-111-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #20813 from nextcloud/lazy-folderMorris Jobke2020-05-124-456/+499
|\ \ \ \
| * | | | generalize the "lazy folder" conceptRobin Appelman2020-05-114-456/+499
* | | | | Merge pull request #20936 from nextcloud/revert-20922-enhancement/debug-globa...Roeland Jago Douma2020-05-1211-128/+120
|\ \ \ \ \
| * | | | | Revert "Log trace when deprecated globals are used"Christoph Wurst2020-05-1211-128/+120
| | |_|_|/ | |/| | |
* | | | | Merge pull request #20858 from nextcloud/fix/20289/remember_webauth_namesChristoph Wurst2020-05-121-1/+3
|\ \ \ \ \
| * | | | | Remember the webauthn name of devicesRoeland Jago Douma2020-05-071-1/+3
* | | | | | Merge pull request #20270 from nextcloud/enh/appframework/gzipRoeland Jago Douma2020-05-125-0/+256
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add AppFramework GZip middleware to gzip responsesRoeland Jago Douma2020-05-125-0/+256
* | | | | | Merge pull request #20922 from nextcloud/enhancement/debug-globals-traceMorris Jobke2020-05-1211-120/+128
|\ \ \ \ \ \
| * | | | | | Log trace when deprecated globals are usedChristoph Wurst2020-05-1211-120/+128
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-05-1234-20/+256
* | | | | | Merge pull request #20910 from nextcloud/dependabot/npm_and_yarn/nextcloud/di...Roeland Jago Douma2020-05-1120-166/+159
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Bump @nextcloud/dialogs from 1.2.2 to 1.3.0dependabot-preview[bot]2020-05-1120-166/+159
| | |_|/ / | |/| | |
* | | | | Merge pull request #20876 from nextcloud/warn/js/settingsRoeland Jago Douma2020-05-1130-189/+178
|\ \ \ \ \
| * | | | | Fix some linter warnings in settingsRoeland Jago Douma2020-05-1130-189/+178
| |/ / / /
* | | | | Merge pull request #20901 from nextcloud/warn/js/commentsMorris Jobke2020-05-114-20/+20
|\ \ \ \ \
| * | | | | Fix some js linter warnings in commentsRoeland Jago Douma2020-05-104-20/+20
* | | | | | Merge pull request #20915 from nextcloud/enh/use_random_bytes_in_cryptoRoeland Jago Douma2020-05-112-11/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use random_bytesRoeland Jago Douma2020-05-112-11/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #20906 from nextcloud/dependabot/npm_and_yarn/mochapack-2.0.0Roeland Jago Douma2020-05-112-10/+10
|\ \ \ \ \
| * | | | | Bump mochapack from 1.1.15 to 2.0.0dependabot-preview[bot]2020-05-112-10/+10
* | | | | | Merge pull request #20844 from nextcloud/feature/noid/maintenance-mode-webdav...Roeland Jago Douma2020-05-1112-20/+42
|\ \ \ \ \ \
| * | | | | | Translate the maintenance mode message in webdavMorris Jobke2020-05-0612-20/+42