Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nextcloud/server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a725e46beec423088ab818ea7a9caa90b71db70
Choose a base ref
..
head repository: nextcloud/server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6349f6ff5ba519c27d517c6dfc342a01c9808527
Choose a head ref
2 changes: 1 addition & 1 deletion .reuse/dep5
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Upstream-Name: nextcloud
Upstream-Contact: Nextcloud <info@nextcloud.com>
Source: https://github.com/nextcloud/server

Files: lib/l10n/*.js lib/l10n/*.json core/l10n/*.js core/l10n/*.json apps/admin_audit/l10n/*.js apps/admin_audit/l10n/*.json apps/comments/l10n/*.js apps/comments/l10n/*.json apps/dav/l10n/*.js apps/dav/l10n/*.json apps/encryption/l10n/*.js apps/encryption/l10n/*.json apps/federatedfilesharing/l10n/*.js apps/federatedfilesharing/l10n/*.json apps/federation/l10n/*.js apps/federation/l10n/*.json apps/files/l10n/*.js apps/files/l10n/*.json apps/files_external/l10n/*.js apps/files_external/l10n/*.json apps/files_sharing/l10n/*.js apps/files_sharing/l10n/*.json apps/files_trashbin/l10n/*.js apps/files_trashbin/l10n/*.json apps/files_versions/l10n/*.js apps/files_versions/l10n/*.json apps/provisioning_api/l10n/*.js apps/provisioning_api/l10n/*.json apps/settings/l10n/*.js apps/settings/l10n/*.json apps/systemtags/l10n/*.js apps/systemtags/l10n/*.json apps/testing/l10n/*.js apps/testing/l10n/*.json apps/updatenotification/l10n/*.js apps/updatenotification/l10n/*.json apps/user_ldap/l10n/*.js apps/user_ldap/l10n/*.json lib/l10nm/*.js lib/l10nm/*.json
Files: lib/l10n/*.js lib/l10n/*.json core/l10n/*.js core/l10n/*.json apps/admin_audit/l10n/*.js apps/admin_audit/l10n/*.json apps/comments/l10n/*.js apps/comments/l10n/*.json apps/dav/l10n/*.js apps/dav/l10n/*.json apps/encryption/l10n/*.js apps/encryption/l10n/*.json apps/federatedfilesharing/l10n/*.js apps/federatedfilesharing/l10n/*.json apps/federation/l10n/*.js apps/federation/l10n/*.json apps/files/l10n/*.js apps/files/l10n/*.json apps/files_external/l10n/*.js apps/files_external/l10n/*.json apps/files_sharing/l10n/*.js apps/files_sharing/l10n/*.json apps/files_trashbin/l10n/*.js apps/files_trashbin/l10n/*.json apps/files_versions/l10n/*.js apps/files_versions/l10n/*.json apps/profile/l10n/*.js apps/provisioning_api/l10n/*.js apps/provisioning_api/l10n/*.json apps/settings/l10n/*.js apps/settings/l10n/*.json apps/systemtags/l10n/*.js apps/systemtags/l10n/*.json apps/testing/l10n/*.js apps/testing/l10n/*.json apps/updatenotification/l10n/*.js apps/updatenotification/l10n/*.json apps/user_ldap/l10n/*.js apps/user_ldap/l10n/*.json lib/l10nm/*.js lib/l10nm/*.json
Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud translators
License: AGPL-3.0-only OR AGPL-3.0-or-later

2 changes: 1 addition & 1 deletion apps/dav/lib/AppInfo/Application.php
View file
Original file line number Diff line number Diff line change
@@ -81,6 +81,7 @@
use OCP\Config\BeforePreferenceSetEvent;
use OCP\Contacts\IManager as IContactsManager;
use OCP\DB\Events\AddMissingIndicesEvent;
use OCP\EventDispatcher\GenericEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Federation\Events\TrustedServerRemovedEvent;
use OCP\Files\AppData\IAppDataFactory;
@@ -91,7 +92,6 @@
use OCP\User\Events\OutOfOfficeScheduledEvent;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
use Throwable;
use function is_null;

5 changes: 5 additions & 0 deletions build/integration/dav_features/caldav.feature
View file
Original file line number Diff line number Diff line change
@@ -87,3 +87,8 @@ Feature: caldav
When "user0" requests principal "users/user0" on the endpoint "/remote.php/dav/principals/"
Then The CalDAV response should be multi status
And The CalDAV response should contain a property "{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL" with a href value "/remote.php/dav/calendars/user0/MyCalendar2/"

Scenario: Should create default calendar on first login
Given user "first-login" exists
When "first-login" requests calendar "first-login/personal" on the endpoint "/remote.php/dav/calendars/"
Then The CalDAV HTTP status code should be "207"
4 changes: 4 additions & 0 deletions build/integration/dav_features/carddav.feature
View file
Original file line number Diff line number Diff line change
@@ -79,3 +79,7 @@ Feature: carddav
Then The CardDAV HTTP status code should be "404"
And The CardDAV exception is "Sabre\DAV\Exception\NotFound"
And The CardDAV error message is "File not found: admin in 'addressbooks'"

Scenario: Should create default addressbook on first login
Given user "first-login" exists
Then "first-login" requests addressbook "first-login/contacts" with statuscode "207" on the endpoint "/remote.php/dav/addressbooks/users/"
2 changes: 1 addition & 1 deletion lib/public/AppFramework/Db/Entity.php
View file
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ protected function markFieldUpdated(string $attribute): void {
* @return string the property name
* @since 7.0.0
*/
public function columnToProperty(string $columnName): string {
public function columnToProperty(string $columnName) {
$parts = explode('_', $columnName);
$property = '';