summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow to force rename a conflicting calendarJohn Molakvoæ (skjnldsv)2020-12-102-17/+71
* Merge pull request #24581 from nextcloud/bugfix/noid/setup-jsJohn Molakvoæ2020-12-071-1/+0
|\
| * Do not load nonexisting setup.jsJulius Härtl2020-12-071-1/+0
* | Merge pull request #24578 from nextcloud/add-integration-tests-for-avatarsJohn Molakvoæ2020-12-076-9/+499
|\ \
| * | Add integration tests for getting guest avatarsDaniel Calviño Sánchez2020-12-072-0/+30
| * | Add integration tests for resized user avatarsDaniel Calviño Sánchez2020-12-072-7/+88
| * | Add integration tests for user avatarsDaniel Calviño Sánchez2020-12-076-0/+369
| * | Make possible to set body in requesttoken requests in integration testsDaniel Calviño Sánchez2020-12-071-7/+17
| * | Make possible to send requests as anonymous users in integration testsDaniel Calviño Sánchez2020-12-071-2/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2020-12-0728-42/+104
* | [tx-robot] updated from transifexNextcloud bot2020-12-0632-22/+84
* | [tx-robot] updated from transifexNextcloud bot2020-12-0530-6/+48
* | Merge pull request #24552 from nextcloud/enh/remember_me_is_not_app_passwordRoeland Jago Douma2020-12-041-2/+12
|\ \
| * | Fix typo Morris Jobke2020-12-041-1/+1
| * | Remember me is not an app_passwordRoeland Jago Douma2020-12-041-2/+12
* | | Merge pull request #24550 from nextcloud/enh/fix/new_session_id_if_decrypt_failsMorris Jobke2020-12-041-0/+1
|\ \ \
| * | | Generate a new session id if the decrypting the session data failsRoeland Jago Douma2020-12-041-0/+1
| |/ /
* | | Merge pull request #24545 from nextcloud/bugfix/noid/force-composerv2Joas Schilling2020-12-041-1/+1
|\ \ \
| * | | Always install composer v2Julius Härtl2020-12-041-1/+1
| | |/ | |/|
* | | Merge pull request #24543 from nextcloud/bugfix/noid/dont-log-image-as-stringMorris Jobke2020-12-041-0/+3
|\ \ \ | |/ / |/| |
| * | Don't log params of imagecreatefromstringVincent Petry2020-12-041-0/+3
|/ /
* | Merge pull request #24474 from nextcloud/enhancement/unified-search-result-at...Christoph Wurst2020-12-042-1/+25
|\ \
| * | Add attributes to file search resultsChristoph Wurst2020-12-031-1/+4
| * | Allow unified search results to have attributesChristoph Wurst2020-12-031-0/+21
* | | [tx-robot] updated from transifexNextcloud bot2020-12-0434-0/+34
* | | Merge pull request #24535 from nextcloud/fix/multiple_file_downloadRoeland Jago Douma2020-12-031-0/+1
|\ \ \ | |/ / |/| |
| * | Fix the download of multiple files from the webUIRoeland Jago Douma2020-12-031-0/+1
| |/
* | Merge pull request #24358 from nextcloud/dav-storage-copyMorris Jobke2020-12-031-2/+24
|\ \ | |/ |/|
| * use storage copy implementation when doing dav copyRobin Appelman2020-11-241-2/+24
* | Merge pull request #24498 from nextcloud/enhancement/nextcloud-log-normalizerJoas Schilling2020-12-032-2/+1
|\ \
| * | Replace abandoned log normalizer with our forkChristoph Wurst2020-12-032-2/+1
* | | Merge pull request #24409 from nextcloud/bugfix/24399Morris Jobke2020-12-032-2/+4
|\ \ \
| * | | Also handle legacy cipher support when encryption is disabled but an old mast...Julius Härtl2020-12-032-2/+4
| |/ /
* | | Merge pull request #24516 from nextcloud/enh/23278/add-icon-for-notificationChristoph Wurst2020-12-031-3/+8
|\ \ \ | |/ / |/| |
| * | Improve wordingMorris Jobke2020-12-021-2/+2
| * | Add icon to user limit notificationMorris Jobke2020-12-021-1/+6
* | | Merge pull request #24519 from nextcloud/fix/bug/emailtemplateMorris Jobke2020-12-032-2/+2
|\ \ \
| * | | Fix vsprint parameterRoeland Jago Douma2020-12-032-2/+2
| |/ /
* | | Merge pull request #24429 from nextcloud/3rdparty/closureChristoph Wurst2020-12-035-8/+19
|\ \ \
| * | | Update psalm-baseline.xmlMorris Jobke2020-12-021-0/+15
| * | | [3rdparty] Migrate to Opis/ClosureRoeland Jago Douma2020-12-024-8/+4
| |/ /
* | | Merge pull request #24524 from nextcloud-pr-bot/automated/noid/psalm-baseline...Morris Jobke2020-12-031-1/+1
|\ \ \
| * | | Update psalm baselineNextcloud-PR-Bot2020-12-031-1/+1
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2020-12-036-6/+58
* | | Merge pull request #24459 from nextcloud/fix/23096/workflow-fix-mimetype-chec...Morris Jobke2020-12-021-2/+6
|\ \ \ | |/ / |/| |
| * | Only execute plain mimetype check for directories and do the fallback only fo...Morris Jobke2020-11-301-2/+6
* | | Merge pull request #24113 from nextcloud/extend-cache-eventsRoeland Jago Douma2020-12-0211-12/+159
|\ \ \
| * | | code style and dispatchTypedRobin Appelman2020-12-023-4/+1
| * | | rename cache event to follow new naming standardsRobin Appelman2020-11-268-17/+103
| * | | extend cache eventsRobin Appelman2020-11-267-5/+69