upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-03 05:51:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
59083 commits 698 branches 1186 tags 6.5 GiB
Commit graph

59083 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ
5d7d70538b
Merge pull request #27827 from nextcloud/enh/27292/singular-plural 2021-07-07 08:23:39 +02:00
Nextcloud bot
085f9d6ca9
[tx-robot] updated from transifex 2021-07-07 02:26:06 +00:00
szaimen
addc825275 add singular and plural in for days in admin sharing settings 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-06 19:05:17 +02:00
kesselb
9f04a7c71e
Merge pull request #27801 from nextcloud/enh/noid/hardening-dns-pin-middleware 
Ignore subdomain for soa queries
 2021-07-06 18:55:25 +02:00
kesselb
5e7206d23a
Merge pull request #27818 from nextcloud/fix/locking-cache-check 
Fix in locking cache check
 2021-07-06 18:53:51 +02:00
Nextcloud bot
17e58f5056
[tx-robot] updated from transifex 2021-07-06 02:26:02 +00:00
MichaIng
0304eea58d
Fix in locking cache check 
The intention obviously was to check whether $lockingCacheClass is defined, and existing class, and available. It was however checked whether the $distributedCacheClass is an existing class, which would have caused an exception already in the previous distributed cache check.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-07-05 23:11:13 +02:00
Christoph Wurst
26efbe982e
Merge pull request #27794 from nextcloud/fix/clarify-lazy-event-listener-container 
Clarify that lazy event listeners are built from the server container
 2021-07-05 21:13:53 +02:00
Daniel Kesselberg
b6530e5e82
Ignore subdomain for soa queries 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 20:29:06 +02:00
Pytal
04441d5012
Merge pull request #27767 from nextcloud/enh/20515/maintenance-mode-info 
Improve maintenance mode info
 2021-07-05 10:44:10 -07:00
Lukas Reschke
8037a4be57
Merge pull request #27799 from nextcloud/bug/26425/check-return-encrypt 
Throw exception if encrypting the data failed.
 2021-07-05 18:53:32 +02:00
John Molakvoæ
b396aee333
Merge pull request #27758 from nullspoon/fix-dns-pinning 2021-07-05 17:37:51 +02:00
Lukas Reschke
931a871533
Merge pull request #27796 from nextcloud/bug/26839/check-pdo 
Check that pdo is installed
 2021-07-05 17:24:39 +02:00
Lukas Reschke
d35a915a53
Merge pull request #27810 from nextcloud/Valdnet-patch-1 
Add a text string to l10n
 2021-07-05 16:36:20 +02:00
Valdnet
2100b38f3c
Add a text string to l10n 2021-07-05 15:42:37 +02:00
Valdnet
b9dd8ed873
Add a text string to l10n 2021-07-05 15:40:00 +02:00
Christoph Wurst
a6a31bb419
Clarify that lazy event listeners are built from the server container 
Ref https://github.com/nextcloud/server/issues/27793

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-07-05 12:11:54 +02:00
Lukas Reschke
415d704959
Merge pull request #27198 from nextcloud/tests/run-s3-tests 
Run s3 tests again
 2021-07-05 11:52:48 +02:00
Daniel Kesselberg
0a15043f69
Throw exception if encrypting the data failed. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 10:23:16 +02:00
Daniel Kesselberg
c91bb98e5c
Check that pdo is installed 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 09:49:05 +02:00
Nextcloud bot
bb22d38aa1
[tx-robot] updated from transifex 2021-07-05 02:25:35 +00:00
Nextcloud bot
4aefd04f40
[tx-robot] updated from transifex 2021-07-04 02:25:36 +00:00
Nextcloud bot
329e517fd9
[tx-robot] updated from transifex 2021-07-03 02:25:58 +00:00
Aaron Ball
484913dc31
Fix DnsPinMiddleware resolve pinning bug 
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>
 2021-07-02 16:08:44 -06:00
Julius Härtl
a0d9dce26e
Merge pull request #27750 from nextcloud/folder-search-filter-self 
dont include folder being search in in the results
 2021-07-02 17:50:25 +02:00
Julius Härtl
24a8532393
Merge pull request #27771 from nextcloud/bugfix/noid/autotest-wait-pgsql-docker 
Add connection check in autotest.sh for pgsql docker
 2021-07-02 17:42:29 +02:00
Robin Appelman
9884344230
dont include folder being search in in the results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-02 16:32:25 +02:00
Joas Schilling
8ebbd91909
Merge pull request #17148 from nextcloud/always-provide-color-to-default-personal-calendar 
Always provide theme color for default personal calendar
 2021-07-02 16:29:18 +02:00
Vincent Petry
526d36c290
Add connection check in autotest.sh for pgsql docker 
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>
 2021-07-02 15:26:06 +02:00
szaimen
37ff07b9e1 Improve maintenance mode info 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-02 13:54:33 +02:00
Nextcloud bot
129214e430
[tx-robot] updated from transifex 2021-07-02 02:25:20 +00:00
blizzz
7589d5a176
Merge pull request #27533 from Rid/master 
Fix scanner mistaking socket files for directories
 2021-07-01 17:36:06 +02:00
blizzz
62675eb5c2
Merge pull request #27586 from nextcloud/bugfi/noid/objectstore-checksum 
Reset checksum when writing files to object store
 2021-07-01 17:30:54 +02:00
John Molakvoæ
86d0afdb5e
Merge pull request #27737 from nextcloud/enh/19906/contactsmenu 
make contactsmenu icon bigger
 2021-07-01 15:24:16 +02:00
John Molakvoæ
9a7d432b55
Merge pull request #27742 from nextcloud/enh/explicit-hint-federation-local 
Clarify that federated sharing settings may also affect shares between users on the current instanc
 2021-07-01 15:23:52 +02:00
Julius Härtl
660c0f7942
Clarify that federated sharing settings may also affect shares between users on the current instance 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 11:41:21 +02:00
Julius Härtl
ddb9840e2f
Merge pull request #27739 from nextcloud/enh/noid/app-settings-button 
design fixes to app-settings button
 2021-07-01 10:28:42 +02:00
Julius Härtl
3853307a6a
Merge pull request #26681 from nextcloud/techdebt/hint-exception-ocp 
Move HintException to OCP
 2021-07-01 08:34:55 +02:00
Julius Härtl
55cabef723
Use minio for s3 tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 08:22:24 +02:00
Nextcloud bot
bb40e65e4e
[tx-robot] updated from transifex 2021-07-01 02:24:48 +00:00
szaimen
2d691346ce design fixes to app-settings button 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-01 01:09:38 +02:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
szaimen
8b47477cae make contactsmenu icon bigger 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-06-30 20:35:26 +02:00
blizzz
6da9ccc9ee
Merge pull request #27732 from nextcloud/fix/27576/LDAPProviderFactory-not-found 
Fix LDAPProviderFactory not found
 2021-06-30 18:50:06 +02:00
Arthur Schiwon
f62c066459
unset ldap provider when disabling user_ldap 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 15:25:00 +02:00
Arthur Schiwon
12e4484dba
ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 15:09:27 +02:00
Julius Härtl
3f44fd00e2
Run s3 tests again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-30 14:30:04 +02:00
Julius Härtl
75f7287b5e
Merge pull request #27638 from nextcloud/enh/noid/fix-encrypted-version 2021-06-30 14:17:38 +02:00
John Molakvoæ
192e53c1ad
Merge pull request #27723 from nextcloud/fix/noid/typo-regex 
fix incredible off-by-one-typo-error
 2021-06-30 14:16:16 +02:00
blizzz
f99a895047
Merge pull request #27700 from nextcloud/deprecate-remote 
Deprecate OCP\Remote
 2021-06-30 11:21:12 +02:00