aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27758 from nullspoon/fix-dns-pinningJohn Molakvoæ2021-07-051-5/+12
|\
| * Fix DnsPinMiddleware resolve pinning bugAaron Ball2021-07-021-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libcurl expects the value of the CURLOPT_RESOLVE configurations to be an array of strings, those strings containing a comma delimited list of resolved IPs for each host:port combination. The original code here does create that array with the host:port:ip combination, but multiple ips for a single host:port result in additional array entries, rather than adding them to the end of the string with a comma. Per the libcurl docs, the `CURLOPT_RESOLVE` array entries should match the syntax `host:port:address[,address]`. This creates a function-scoped associative array which uses `host:port` as the key (which are supposed to be unique and this ensures that), and the value is an array containing IP strings (ipv4 or ipv6). Once the associative array is populated, it is then set to the CURLOPT_RESOLVE array, imploding the ip arrays using a comma delimiter so the array syntax matches the expected by libcurl. Note that this reorders the "foreach ip" and "foreach port" loops. Rather than looping over ips then ports, we now loop over ports then ips, since ports are part of the unique host:port map, and multiple ips can exist therein. Signed-off-by: Aaron Ball <nullspoon@oper.io>
* | Merge pull request #27796 from nextcloud/bug/26839/check-pdoLukas Reschke2021-07-051-1/+4
|\ \ | | | | | | Check that pdo is installed
| * | Check that pdo is installedDaniel Kesselberg2021-07-051-1/+4
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #27810 from nextcloud/Valdnet-patch-1Lukas Reschke2021-07-052-2/+2
|\ \ \ | | | | | | | | Add a text string to l10n
| * | | Add a text string to l10nValdnet2021-07-051-1/+1
| | | |
| * | | Add a text string to l10nValdnet2021-07-051-1/+1
|/ / /
* | | Merge pull request #27198 from nextcloud/tests/run-s3-testsLukas Reschke2021-07-054-14/+22
|\ \ \ | |/ / |/| | Run s3 tests again
| * | Use minio for s3 testsJulius Härtl2021-07-013-8/+19
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Run s3 tests againJulius Härtl2021-06-302-6/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2021-07-052-0/+20
| | |
* | | [tx-robot] updated from transifexNextcloud bot2021-07-048-48/+50
| | |
* | | [tx-robot] updated from transifexNextcloud bot2021-07-0312-24/+34
| |/ |/|
* | Merge pull request #27750 from nextcloud/folder-search-filter-selfJulius Härtl2021-07-021-1/+7
|\ \ | | | | | | dont include folder being search in in the results
| * | dont include folder being search in in the resultsRobin Appelman2021-07-021-1/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #27771 from nextcloud/bugfix/noid/autotest-wait-pgsql-dockerJulius Härtl2021-07-021-2/+4
|\ \ \ | |/ / |/| | Add connection check in autotest.sh for pgsql docker
| * | Add connection check in autotest.sh for pgsql dockerVincent Petry2021-07-021-2/+4
| | | | | | | | | | | | | | | | | | | | | When using pgsql docker for testing locally with autotest, make sure to properly wait for the port to be available. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | Merge pull request #17148 from ↵Joas Schilling2021-07-022-6/+46
|\ \ \ | |/ / |/| | | | | | | | nextcloud/always-provide-color-to-default-personal-calendar Always provide theme color for default personal calendar
| * | Make default calendar only contain VEVENTSThomas Citharel2021-06-252-3/+6
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Always provide theme color for default personal calendarThomas Citharel2021-06-252-6/+43
| | | | | | | | | | | | | | | | | | Before this calendar-color wasn't defined for default calendar Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | [tx-robot] updated from transifexNextcloud bot2021-07-02114-112/+144
| | |
* | | Merge pull request #27533 from Rid/masterblizzz2021-07-011-2/+2
|\ \ \ | | | | | | | | Fix scanner mistaking socket files for directories
| * | | Fix scanner mistaking socket files for directoriesRid2021-06-171-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rid <rid@cylo.io>
* | | | Merge pull request #27586 from nextcloud/bugfi/noid/objectstore-checksumblizzz2021-07-011-0/+1
|\ \ \ \ | | | | | | | | | | Reset checksum when writing files to object store
| * | | | Reset checksum when writing files to object storeJulius Härtl2021-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #27737 from nextcloud/enh/19906/contactsmenuJohn Molakvoæ2021-07-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | make contactsmenu icon bigger
| * | | | | make contactsmenu icon biggerszaimen2021-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | | | | Merge pull request #27742 from nextcloud/enh/explicit-hint-federation-localJohn Molakvoæ2021-07-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify that federated sharing settings may also affect shares between users on the current instanc
| * | | | | | Clarify that federated sharing settings may also affect shares between users ↵Julius Härtl2021-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the current instance Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #27739 from nextcloud/enh/noid/app-settings-buttonJulius Härtl2021-07-011-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | design fixes to app-settings button
| * | | | | | | design fixes to app-settings buttonszaimen2021-07-011-1/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | | | | | Merge pull request #26681 from nextcloud/techdebt/hint-exception-ocpJulius Härtl2021-07-0160-134/+185
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Move HintException to OCP
| * | | | | | Migrate HintException to OCPGary Kim2021-06-3060-134/+185
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* / / / / / [tx-robot] updated from transifexNextcloud bot2021-07-0122-74/+74
|/ / / / /
* | | | | Merge pull request #27732 from nextcloud/fix/27576/LDAPProviderFactory-not-foundblizzz2021-06-305-1/+58
|\ \ \ \ \ | | | | | | | | | | | | Fix LDAPProviderFactory not found
| * | | | | unset ldap provider when disabling user_ldapArthur Schiwon2021-06-304-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | ensure that factoryClass exisits before instantiationArthur Schiwon2021-06-301-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #27638 from nextcloud/enh/noid/fix-encrypted-versionJulius Härtl2021-06-305-0/+635
|\ \ \ \ \
| * | | | | Prevent running FixEncryptedVersion without master keyVincent Petry2021-06-292-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return an error when running occ encryption:fix-encrypted-version when master key encryption is not enabled. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | Fix FixEncryptedVersionTest testVincent Petry2021-06-292-158/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed setup to use EncryptionTrait like other existing tests. Fix expectations to not rely on side effects from previous test cases. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | Fix warnings in FixEncryptedVersion commandVincent Petry2021-06-291-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed code warnings Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | Detect disabled signature check when reparingVincent Petry2021-06-291-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running occ encryption:fix-encrypted-version, detect whether the setting 'encryption_skip_signature_check' is set and abort if it is, because the repair cannot detect version mismatch errors with it enabled. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | Downstream FixEncryptedVersionTestVincent Petry2021-06-291-0/+373
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | | Downstream encryption:fix-encrypted-versionVincent Petry2021-06-294-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fixing "Bad signature" errors. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | | | | Merge pull request #27723 from nextcloud/fix/noid/typo-regexJohn Molakvoæ2021-06-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix incredible off-by-one-typo-error
| * | | | | | fix incredible off-by-one-typo-errorArthur Schiwon2021-06-301-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #27700 from nextcloud/deprecate-remoteblizzz2021-06-308-0/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Deprecate OCP\Remote
| * | | | | Deprecate OCP\RemoteLukas Reschke2021-06-288-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unused. Fixes https://github.com/nextcloud/server/issues/25780 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #27717 from nextcloud/feat/workflow-auto-updateJohn Molakvoæ2021-06-301-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updating dependabot-approve-merge.yml workflow from template
| * | | | | | Updating dependabot-approve-merge.yml workflow from templateNextcloud bot2021-06-291-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-25 11:48:13 +0000