summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2022-06-0610-8/+90
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* [tx-robot] updated from transifexNextcloud bot2022-06-058-0/+14
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* [tx-robot] updated from transifexNextcloud bot2022-06-04190-256/+336
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #32537 from nextcloud/rakekniven-patch-2rakekniven2022-06-033-4/+4
|\ | | | | l10n: Fix escaping issue
| * l10n: Fix escaping issuerakekniven2022-06-033-4/+4
|/ | | | | | | | | | | At Transifex the string is cut and shown `For the server to work properly, it` I modified this without vue knowledge. @CarlSchwan Can you check please? Reported at Transifex. Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* Merge pull request #32556 from nextcloud/bugfix/noid/fix-comments-query-handlingJoas Schilling2022-06-031-4/+3
|\ | | | | Create query parameters on correct objects to make debugging easier
| * Create query parameters on correct objects to make debugging easierJoas Schilling2022-05-231-4/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #32620 from nextcloud/bugfix/noid/reset-status-on-clearAtJoas Schilling2022-06-0312-32/+25
|\ \ | | | | | | Also reset the status on clearAt
| * | Also reset the status on clearAtJoas Schilling2022-05-2712-32/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | When you set yourself to "DND - In a meeting" for one hour, the expectation is that you are also "online"/normal again when the meeting is over. So we extend the logic to also include the status itself to be reverted. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #32435 from nextcloud/revert-32278-remove-default-phpJoas Schilling2022-06-031-1/+10
|\ \ \ | | | | | | | | Revert "Remove call to already default php.ini values"
| * | | Revert "Remove call to already default php.ini values"Joas Schilling2022-05-161-1/+10
| | | |
* | | | Merge pull request #32716 from nextcloud/Valdnet-patch-2Valdnet2022-06-031-1/+1
|\ \ \ \ | | | | | | | | | | l10n: Change to a capital letter
| * | | | l10n: Change to a capital letterValdnet2022-06-031-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
* | | | | Merge pull request #32715 from nextcloud/enh/direct-editing-capabilitiesJohn Molakvoæ2022-06-035-28/+58
|\ \ \ \ \ | |/ / / / |/| | | | Only load direct editing capabilities when required
| * | | | Only load direct editing capabilities when requiredJulius Härtl2022-06-035-28/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-06-0316-2/+132
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #32713 from nextcloud/fix/button_active_in_notifPytal2022-06-023-7/+7
|\ \ \ \ \
| * | | | | Prevent button in notifications to be impacted by css ruleLouis Chemineau2022-06-023-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | Merge pull request #32702 from nextcloud/fix/header_entries_orderPytal2022-06-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Declare header entries in the order they are displayedLouis Chemineau2022-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notifications entry was declared after the search one, but they are rendered in a different order. This PR switch their declarations, so the order they appear in match their order in the DOM. Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | Merge pull request #32662 from nextcloud/bugfix/noid/cleanup-s3-tmpJulius Härtl2022-06-021-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup temporary files after finishing the write to object storage
| * | | | | | Cleanup temporary files after finishing the write to object storageJulius Härtl2022-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #32570 from ↵Côme Chilliet2022-06-021-5/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/remove-at-matcher-in-federatedfilesharing-tests Remove at() matcher from tests in federatedfilesharing
| * | | | | | | Remove at() matcher from tests in federatedfilesharingCôme Chilliet2022-05-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | | Merge pull request #32682 from nextcloud/fix/compile_cmd_sass_cmdVincent Petry2022-06-021-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add --if-present flag to prevent error when sass script does not exists
| * | | | | | | Add --if-present flag to prevent error when sass script does not existsLouis Chemineau2022-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | | | Merge pull request #28703 from nextcloud/enhancement/caldav-reminders-loggingChristoph Wurst2022-06-022-25/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Debug log what happens during reminders processing
| * | | | | | | | Debug log what happens during reminders processingChristoph Wurst2022-06-012-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | Merge pull request #32690 from ↵blizzz2022-06-022-1/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-mountpoint-matching-encryption Trim mount point before matching in encryption code
| * | | | | | | | | Add unit tests for encryption's isSystemWideMountPointVincent Petry2022-06-011-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | | | | | Trim mount point before matching in encryption codeVincent Petry2022-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often times the mount point has a leading slash. This fix sanitizes it to make sure matching works. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | | | | | | | | Merge pull request #32696 from nextcloud/fix/use-image-from-ocpblizzz2022-06-0216-22/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Use Image class from public API
| * | | | | | | | | Use Image class from public APIChristopher Ng2022-06-0216-22/+20
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* / / / / / / / / [tx-robot] updated from transifexNextcloud bot2022-06-02156-234/+318
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | Merge pull request #32471 from nextcloud/fix-wrong-dav-activitiesChristoph Wurst2022-06-013-4/+111
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make sure activities are not created when a deleted calendar object expires
| * | | | | | | | Make sure activities are not created when a deleted calendar object expiresThomas Citharel2022-05-183-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/nextcloud/activity/issues/784 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | | | | Merge pull request #32686 from nextcloud/perf/make-x-hash-optinblizzz2022-06-011-9/+20
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Make X-HAS-{MD5/SHA256} opt-in
| * | | | | | | | Make X-HAS-{MD5/SHA256} opt-inCarl Schwan2022-06-011-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not always needed and slow down the upload Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | | | | | Fix small typoCarl Schwan2022-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | | | | | | | Merge pull request #32371 from nextcloud/fix-31952Vincent Petry2022-06-012-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | More meaningfull message when a public authenticated share's password is wrong or has expired.
| * | | | | | | | More meaningfull message when a public authenticated share's password is ↵Cyrille Bollu2022-05-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong or has expired Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-06-0116-2/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | Merge pull request #32666 from nextcloud/fix/background-job-type-checkChristoph Wurst2022-05-311-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Check background job type
| * | | | | | | | | Check background job typeChristoph Wurst2022-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is assumed that a job class loaded from the jobs table is an IJob, but due to programming error the job might be of another type. Then the setters will most likely fail. This patch adds an interface type check so only correct jobs are used, anything else is ignored. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | Merge pull request #32670 from nextcloud/fix/share_permissions_renderingPytal2022-05-313-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix share permissions renderingLouis Chemineau2022-05-313-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `SHARE` permissions falls into the `default` case in the switch case, causing the rendering to look like ` , Upload, Read`. This PR changes the return value of the `default` case and adds a `filter` to remove those values. Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | | | | | | Merge pull request #32671 from nextcloud/debt/noid/psalm-baselineJulius Härtl2022-05-311-14/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Update psalm-baseline
| * | | | | | | | | | Update psalm-baselineDaniel Kesselberg2022-05-311-14/+23
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | | Merge pull request #32485 from nextcloud/debt/noid/psalm-streamer-fhblizzz2022-05-312-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [Psalm] Fix docblock for addFileFromStream
| * | | | | | | | | Fix type for resourceDaniel Kesselberg2022-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 12:01:49 +0000