summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23248 from nextcloud/techdebt/server-getters-query-getRoeland Jago Douma2020-10-071-102/+103
|\ | | | | Use the ContainerInterface::get inside the server container
| * Use the ContainerInterface::get inside the server containerChristoph Wurst2020-10-071-102/+103
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #23252 from nextcloud/fix/l10n/activitiesRoeland Jago Douma2020-10-071-1/+1
|\ \ | | | | | | Use the correct l10n for activities
| * | Use the correct l10n for activitiesRoeland Jago Douma2020-10-071-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #23164 from nextcloud/feat/files-sidebar-cleanup-standardsJohn Molakvoæ2020-10-0757-238/+303
|\ \ \
| * | | Bump @nextcloud/vue to v2.6.9John Molakvoæ (skjnldsv)2020-10-0738-45/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | Upgrade lifecycle and vue parent contextJohn Molakvoæ (skjnldsv)2020-10-0725-116/+165
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | Move Files Sidebar to proper javascript standardJohn Molakvoæ (skjnldsv)2020-10-077-117/+124
| | |/ | |/| | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #23243 from ↵Roeland Jago Douma2020-10-071-222/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | Update psalm baselineNextcloud-PR-Bot2020-10-071-222/+1
| |/ / | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | Merge pull request #23244 from ↵Roeland Jago Douma2020-10-072-14/+17
|\ \ \ | |/ / |/| | | | | | | | nextcloud/techdebt/noid/user-psr-logger-interface-in-comments Use PSR logger interface in comments manager
| * | Use PSR logger interface in comments managerJoas Schilling2020-10-072-14/+17
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2020-10-0754-138/+200
| |
* | Merge pull request #23129 from nextcloud/enh/noid/tests-user-statusMorris Jobke2020-10-062-1/+27
|\ \ | | | | | | More tests for user_status
| * | Another test for user live status listenerDaniel Kesselberg2020-10-011-1/+3
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Add test case for getDefaultStatusByIdDaniel Kesselberg2020-09-241-0/+24
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #23025 from Iscle/masterMorris Jobke2020-10-061-2/+6
|\ \ \ | | | | | | | | DirectController: Let users choose the link expiration time
| * | | DirectController: Verify that expirationTime is between 0s and 24hIscle2020-10-011-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Iscle <albertiscle9@gmail.com>
| * | | DirectController: Let users choose the expiration timeIscle2020-09-241-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Iscle <albertiscle9@gmail.com>
* | | | Merge pull request #23144 from nextcloud/enh/noid/update-param-for-psalmMorris Jobke2020-10-064-17/+19
|\ \ \ \ | |_|_|/ |/| | | Less psalm warnings
| * | | Add explicit typecast for $value.Daniel Kesselberg2020-10-032-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Update signature for setDaniel Kesselberg2020-10-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | also ILiteral and IQueryFunction are valid. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Update signature for in/notInDaniel Kesselberg2020-10-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | $y is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Update signature for like/notLike/in/notInDaniel Kesselberg2020-10-022-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | $x is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #23226 from nextcloud/feature/noid/bump-default-font-sizeJohn Molakvoæ2020-10-061-2/+2
|\ \ \ \ | | | | | | | | | | Bump default font size to 15 px
| * | | | Bump default font size to 15 pxMarco Ambrosini2020-10-061-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
* | | | Merge pull request #23215 from nextcloud/bugfix/noid/only-run-the-query-onceRoeland Jago Douma2020-10-061-5/+7
|\ \ \ \ | | | | | | | | | | Only run the query to get the account data once
| * | | | Only run the query to get the account data onceJoas Schilling2020-10-061-5/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #23183 from nextcloud/bugfix/noid/error-styling-on-toastifyRoeland Jago Douma2020-10-061-2/+2
|\ \ \ \ | | | | | | | | | | Don't influence toastify errors and always use white
| * | | | Don't influence toastify errors and always use whiteJoas Schilling2020-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #23209 from ↵Morris Jobke2020-10-061-9/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | | | Update psalm baselineNextcloud-PR-Bot2020-10-061-9/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-10-0618-10/+100
| | | | |
* | | | | Merge pull request #23028 from ↵Morris Jobke2020-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/array-to-string-conversion-on-event-search Fix array to string conversion on event search
| * | | | | Fix array to string conversion on event searchJoas Schilling2020-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #23096 from nextcloud/bugfix/noid/mimetypes2Morris Jobke2020-10-051-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Also check the path based mimetype for flow rule checks
| * | | | | | Make sure to check the mimetype on the path if a secure one could not be ↵Julius Härtl2020-09-291-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detemined though the content Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #22891 from ↵Morris Jobke2020-10-052-7/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/18680/improve-ProvisioningApiMiddleware-service-logic Improve registerService logic for ProvisioningApiMiddleware for static code analysis
| * | | | | | Update baselineMorris Jobke2020-09-161-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Improve registerService logic for ProvisioningApiMiddleware for static code ↵Daniel Kesselberg2020-09-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analysis Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #23189 from nextcloud/enhancement/cs/binary_operator_spacesMorris Jobke2020-10-05335-1529/+1529
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Format code to a single space around binary operators
| * | | | | | | Format code to a single space around binary operatorsChristoph Wurst2020-10-05335-1529/+1529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #23182 from sharidas/fix-user-emailaddrMorris Jobke2020-10-052-13/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix the user email issue while creating a user
| * | | | | | | Fix the user email issue while creating a userSujith Haridasan2020-10-052-13/+19
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user is created, the provisioning api was not adding the email address of the user when provided if the `send email to new user` is not set. Signed-off-by: Sujith Haridasan <sujith.h@gmail.com>
* | | | | | | Merge pull request #23193 from nextcloud/fix/mp/unit_tetssRoeland Jago Douma2020-10-051-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix unit tests
| * | | | | | | Fix unit testsRoeland Jago Douma2020-10-051-0/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #23179 from nextcloud/bugfix/23163Roeland Jago Douma2020-10-053-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix dashboard rendering if accessibility app is disabled
| * | | | | | | Fix dashboard rendering if accessibility app is disabledJulius Härtl2020-10-053-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #23109 from nextcloud/trash-move-no-transactionJoas Schilling2020-10-051-5/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont hold a transaction during the move to trash
| * | | | | | | dont hold a transaction during the move to trashRobin Appelman2020-09-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because moving to trash can take a long time, keeping a transaction active for the duration can lead to issues Signed-off-by: Robin Appelman <robin@icewind.nl>