aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2021-02-0532-220/+536
* Merge pull request #25441 from nextcloud/bugfix/24473/quickfix-tags-view-onceVincent Petry2021-02-043-5/+10
|\
| * Fix duplicate tag info view registrationVincent Petry2021-02-033-5/+10
* | Merge pull request #25443 from nextcloud/bugfix/25442/fix-settings-users-pagi...Roeland Jago Douma2021-02-043-5/+5
|\ \
| * | Make user list pagination more tolerantVincent Petry2021-02-043-5/+5
|/ /
* / [tx-robot] updated from transifexNextcloud bot2021-02-0416-58/+160
|/
* Merge pull request #25467 from nextcloud/debt/noid/test-dbal-exception-wrapRoeland Jago Douma2021-02-031-0/+87
|\
| * Add test for dbal exception wrappingDaniel Kesselberg2021-02-031-0/+87
* | Merge pull request #25468 from nextcloud/fix/nextcloud-upgrade-22Joas Schilling2021-02-031-1/+1
|\ \
| * | Do not allow upgrade from Nextcloud 20Christoph Wurst2021-02-031-1/+0
| * | Allow upgrades in Nextcloud 22Christoph Wurst2021-02-031-0/+1
|/ /
* | Merge pull request #25464 from nextcloud/enhancement/parse-calendar-object-fo...Christoph Wurst2021-02-032-5/+267
|\ \
| * | Parse calendar object for attendees and emit interaction eventsChristoph Wurst2021-02-032-5/+267
|/ /
* | Merge pull request #25432 from nextcloud/enhancement/calendar-interaction-eventsChristoph Wurst2021-02-034-0/+130
|\ \ | |/ |/|
| * Emit an interaction event for calendar event user attendeesChristoph Wurst2021-02-032-14/+39
| * Emit an interaction event for calendar share recipientsChristoph Wurst2021-02-034-0/+105
|/
* Merge pull request #25403 from nextcloud/dependabot/npm_and_yarn/vuex-3.6.2dependabot-preview[bot]2021-02-0312-17/+17
|\
| * Bump vuex from 3.6.0 to 3.6.2dependabot-preview[bot]2021-02-0312-17/+17
* | Merge pull request #25454 from nextcloud/this-is-22Joas Schilling2021-02-0330-31/+31
|\ \
| * | This is 22Joas Schilling2021-02-0330-31/+31
|/ /
* / [tx-robot] updated from transifexNextcloud bot2021-02-0312-2/+32
|/
* Merge pull request #25453 from nextcloud/revert-25438-pin-psalm-versionRoeland Jago Douma2021-02-021-1/+1
|\
| * Revert "Pin Psalm version to an older one"Roeland Jago Douma2021-02-021-1/+1
|/
* Merge pull request #25438 from nextcloud/pin-psalm-versionRoeland Jago Douma2021-02-021-1/+1
|\
| * Pin Psalm version to an older oneLukas Reschke2021-02-021-1/+1
* | Merge pull request #24700 from Imajie/s3-credsRoeland Jago Douma2021-02-021-1/+5
|\ \
| * | Fix failing testsJames Letendre2020-12-151-1/+1
| * | Add web identity provider to S3 connection chainJames Letendre2020-12-151-13/+4
| * | Replace defaultProvider with explicit calls to exclude user home directory lo...James Letendre2020-12-141-1/+15
| * | Resolves #24699, Support ES2 and ECS instance providers for S3 bucketsJames Letendre2020-12-141-2/+1
* | | Merge pull request #25393 from nextcloud/fix/25165/repair-dav-sharesRoeland Jago Douma2021-02-026-1/+340
|\ \ \
| * | | test: adjust expectationArthur Schiwon2021-01-291-3/+2
| * | | show suggestion to clean up possible invalid shares laterArthur Schiwon2021-01-291-0/+6
| * | | take into account that UNIQUE index might not work as expectedArthur Schiwon2021-01-291-0/+1
| * | | add repair job for unencoded calendarsArthur Schiwon2021-01-295-1/+334
* | | | Merge pull request #25429 from nextcloud/dependachristoph/composer/symfony-4....Roeland Jago Douma2021-02-021-0/+0
|\ \ \ \
| * | | | Bump Symfony from 4.4.18 to 4.4.19Christoph Wurst2021-02-021-0/+0
* | | | | Merge pull request #25446 from nextcloud/bugfix/noid/avoid-duplicate-template...Roeland Jago Douma2021-02-021-0/+3
|\ \ \ \ \
| * | | | | Avoid template creators being registered multiple timesJulius Härtl2021-02-021-0/+3
|/ / / / /
* | | | | Merge pull request #25444 from nextcloud/bug/25415/move-generic-errors-to-endChristoph Wurst2021-02-021-13/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Check for generic errors at last.Daniel Kesselberg2021-02-021-13/+13
* | | | | Merge pull request #25424 from nextcloud/bugfix/noid/direct-login-failJulius Härtl2021-02-021-1/+1
|\ \ \ \ \
| * | | | | Keep direct login active when redirectingJulius Härtl2021-02-011-1/+1
* | | | | | Merge pull request #25400 from nextcloud/dependabot/npm_and_yarn/marked-1.2.8Julius Härtl2021-02-027-10/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bump marked from 1.2.7 to 1.2.8dependabot-preview[bot]2021-02-027-10/+10
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2021-02-021160-3402/+1004
* | | | | [tx-robot] updated from transifexNextcloud bot2021-02-0134-38/+1048
* | | | | [tx-robot] updated from transifexNextcloud bot2021-01-3130-70/+1164
* | | | | Merge pull request #25405 from nextcloud-pr-bot/automated/noid/psalm-baseline...Roeland Jago Douma2021-01-301-4/+0
|\ \ \ \ \
| * | | | | Update psalm baselineNextcloud-PR-Bot2021-01-301-4/+0
|/ / / / /