summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2022-03-1318-6/+34
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #31555 from nextcloud/enh/noid/fix-drone-testsCarl Schwan2022-03-121-0/+2
|\ | | | | fix drone tests on master
| * fix drone tests on masterszaimen2022-03-111-0/+2
| | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | Merge pull request #31560 from ↵MichaIng2022-03-122-16/+16
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/puppeteer-13.5.1 Bump puppeteer from 13.4.1 to 13.5.1
| * | Bump puppeteer from 13.4.1 to 13.5.1dependabot[bot]2022-03-122-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 13.4.1 to 13.5.1. - [Release notes](https://github.com/puppeteer/puppeteer/releases) - [Changelog](https://github.com/puppeteer/puppeteer/blob/main/CHANGELOG.md) - [Commits](https://github.com/puppeteer/puppeteer/compare/v13.4.1...v13.5.1) --- updated-dependencies: - dependency-name: puppeteer dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #31562 from ↵dependabot[bot]2022-03-122-8/+8
|\ \ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-6.7.1
| * | | Bump css-loader from 6.7.0 to 6.7.1dependabot[bot]2022-03-122-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.7.0 to 6.7.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.7.0...v6.7.1) --- updated-dependencies: - dependency-name: css-loader dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* / / [tx-robot] updated from transifexNextcloud bot2022-03-1234-0/+52
|/ / | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | Merge pull request #31496 from ↵MichaIng2022-03-120-0/+0
|\ \ | |/ |/| | | | | nextcloud/automated/noid/psalm-baseline-update-1646799120 [Automated] Update psalm-baseline.xml
| * Update psalm baselinenextcloud-command2022-03-091-61/+4
| | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | Merge pull request #31274 from nextcloud/fix/carddav-backend-1000-orache1John Molakvoæ2022-03-111-6/+9
|\ \
| * | Don't recreate sql query each timeCarl Schwan2022-03-101-8/+8
| | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
| * | Fix more than 1000 entries in queries exception in CardDavBackendCarl Schwan2022-02-211-7/+10
| | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | Merge pull request #31531 from nextcloud/fix/sftp-offsetJohn Molakvoæ2022-03-111-0/+3
|\ \ \
| * | | Prevent reading key on SFTP stat boolJohn Molakvoæ2022-03-111-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | | | Merge pull request #31511 from ↵Joas Schilling2022-03-113-13/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-installing-unstable-versions Allow installing unstable app versions based on channel and with `--allow-unstable` just like on updates
| * | | | Overwrite the channelJoas Schilling2022-03-101-9/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Also allow pre-releases and nightlies when installing from gitJoas Schilling2022-03-101-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Similar to the fetch() method respect the channel in the get()Joas Schilling2022-03-101-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow installing unstable versionsJoas Schilling2022-03-101-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #31538 from nextcloud/bug/noid/eventlogger-debugJoas Schilling2022-03-111-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Only log events when enabled in debug mode
| * | | | | Only log events when enabled in debug modeJulius Härtl2022-03-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #31539 from ↵Joas Schilling2022-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/31532/user-status-not-resetting-after-a-call Fix user status not resetting correctly after a call
| * | | | | | Fix user status not resetting correctly after a callJoas Schilling2022-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only happens when the user navigated away and came back, so the heartbeat updates the status to "Online + In a call" After that resetting away from "Away + In a call" does not match anymore and the previous status sticks Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #31454 from nextcloud/fix/audit-log-criticalJohn Molakvoæ2022-03-117-35/+148
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix the logger that is imported for critical actionsCarl Schwan2022-03-107-35/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This use a new interface AuditLogger that makes it easier to seperate the roles of the various loggers and enforce that we don't use the wrong one by mistake. Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | | | Merge pull request #31519 from ↵Vincent Petry2022-03-114-11/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-occ-user-add-apppassword Fix occ user:add-app-password
| * | | | | | | Validate the password before generating an apptokenJoas Schilling2022-03-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Differenciate the activity depending on admin vs user actionJoas Schilling2022-03-102-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Trigger an event to log an activity when an administrator generates an app ↵Joas Schilling2022-03-102-7/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #31526 from ↵John Molakvoæ2022-03-111-15/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | nextcloud/automated/noid/psalm-baseline-update-1646971903
| * | | | | | Update psalm baselinenextcloud-command2022-03-111-15/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-1180-80/+84
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #30963 from nextcloud/feat/calendar-migrationPytal2022-03-1022-0/+1288
|\ \ \ \ \ \
| * | | | | | Improve error handling and output messagesChristopher Ng2022-03-092-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Various minor updatesChristopher Ng2022-03-023-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Minor updatesChristopher Ng2022-03-022-63/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Integrate migratorChristopher Ng2022-03-028-260/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Integration testsChristopher Ng2022-03-0214-0/+739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | | Calendar export and importChristopher Ng2022-03-0210-0/+722
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | | Merge pull request #31491 from ↵Côme Chilliet2022-03-104-7/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/fix/user_ldap-fix-duplicated-empty-uuid-migration Fix duplicated UUID detection when there are empty uuids
| * | | | | | Fix similar potential problems with fetchOne loopsCôme Chilliet2022-03-084-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | Fix duplicated UUID detection when there are empty uuidsCôme Chilliet2022-03-081-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | Merge pull request #31494 from nextcloud/fix/fix-group-metadata-typingVincent Petry2022-03-101-21/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix group metadata typing
| * | | | | | Strong type OC\Group\MetaDataCôme Chilliet2022-03-081-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | | Fix typing of OC\Group\MetaData::sortingCôme Chilliet2022-03-081-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | Merge pull request #31430 from ↵Simon L2022-03-102-9/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enh/31429/improve-overwrite-cli-url-check Validate `overwrite.cli.url` to be a url in setup check
| * | | | | | improve overwrite cli url setup checkszaimen2022-03-092-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | | | | | Merge pull request #31508 from ↵John Molakvoæ2022-03-101-61/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/automated/noid/psalm-baseline-update-1646885516
| * | | | | | | Update psalm baselinenextcloud-command2022-03-101-61/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>