aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Use global $ in settings admin.jsLouis Chemineau2022-03-141-3/+0
| | | | | | | Fix https://github.com/nextcloud/server/issues/31570 Signed-off-by: Louis Chemineau <louis@chmn.me> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* Merge pull request #31566 from nextcloud/fix/unit-auditSimon L2022-03-141-2/+2
|\ | | | | Fix unit tests by importing the class
| * Fix unit tests by importing the classCarl Schwan2022-03-141-2/+2
| | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | Merge pull request #31542 from nextcloud/psalm-userCountsCarl Schwan2022-03-142-2/+6
|\ \ | | | | | | Fix psalm issue about userCounts
| * | Use "use" to import namespacesCarl Schwan2022-03-141-1/+3
| | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
| * | Fix psalm issue about userCountsCarl Schwan2022-03-112-2/+4
| | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | [tx-robot] updated from transifexNextcloud bot2022-03-148-0/+10
| |/ |/| | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | [tx-robot] updated from transifexNextcloud bot2022-03-1312-4/+20
| | | | | | | | 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>
* | | [tx-robot] updated from transifexNextcloud bot2022-03-1218-0/+28
|/ / | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.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 #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-112-2/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-occ-user-add-apppassword Fix occ user:add-app-password
| * | | | | Differenciate the activity depending on admin vs user actionJoas Schilling2022-03-102-2/+12
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #30963 from nextcloud/feat/calendar-migrationPytal2022-03-1021-0/+1283
|\ \ \ \ \
| * | | | | Improve error handling and output messagesChristopher Ng2022-03-092-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | Various minor updatesChristopher Ng2022-03-022-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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-029-0/+717
| | | | | | | | | | | | | | | | | | | | | | | | 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 #31430 from ↵Simon L2022-03-101-8/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-091-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-104-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Fix alternative login buttonsJoas Schilling2022-03-091-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-092-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #31431 from nextcloud/fs-setup-managerRobin Appelman2022-03-085-15/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Unify/cleanup filesystem setup
| * | | | | type fixesRobin Appelman2022-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | simplify setup of circular SetupManager<->ManagerRobin Appelman2022-03-042-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | move logic to decide what to setup to setupmanagerRobin Appelman2022-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | adjust tests to new fs setupRobin Appelman2022-03-044-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #31470 from nextcloud/enh/13099/allow-disable-imagick-warningJohn Molakvoæ2022-03-082-14/+33
|\ \ \ \ \ \
| * | | | | | fix testsszaimen2022-03-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
| * | | | | | allow to disable the imagick warningszaimen2022-03-071-14/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de> Co-Authored-By: MichaIng <micha@dietpi.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Fix too many file download notifications when watching a videoszaimen2022-03-077-14/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | | | | allow adding protocol to domains in 'connectivity_check_domains' configJulien Veyssier2022-03-071-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-03-0612-2/+52
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>