Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/AppInfo/PluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class PluginManager {
private $populated = false;

/**
* Contstruct a PluginManager
* Construct a PluginManager
*
* @param ServerContainer $container server container for resolving plugin classes
* @param IAppManager $appManager app manager to loading apps and their info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private function cleanUpOrphans(
string $parentTable,
string $parentId,
): int {
// We can't merge both queries into a single one here as DELETEing from a table while
// We can't merge both queries into a single one here as deleting from a table while
// SELECTing it in a sub query is not supported by Oracle DB.
// Ref https://docs.oracle.com/cd/E17952_01/mysql-8.0-en/delete.html#idm46006185488144

Expand Down
4 changes: 2 additions & 2 deletions apps/dav/lib/CalDAV/CalDavBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,7 @@ public function restoreCalendarObject(array $objectData): void {
$row = $result->fetchAssociative();
$result->closeCursor();
if ($row === false) {
// Welp, this should possibly not have happened, but let's ignore
// Whelp, this should possibly not have happened, but let's ignore
return;
}
$this->addChanges($row['calendarid'], [$row['uri']], 1, (int)$row['calendartype']);
Expand Down Expand Up @@ -3457,7 +3457,7 @@ public function getDenormalizedData(string $calendarData): array {
}
}
}
// RRULE can be infinate or limited by a UNTIL or COUNT
// RRULE can be infinite or limited by a UNTIL or COUNT
if ($component->RRULE) {
try {
$rule = new EventReaderRRule($component->RRULE->getValue(), $startDate);
Expand Down
12 changes: 6 additions & 6 deletions apps/dav/lib/CalDAV/EventReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class EventReader {
];

/**
* Initilizes the Event Reader
* Initializes the Event Reader
*
* There is several ways to set up the iterator.
*
Expand Down Expand Up @@ -415,7 +415,7 @@ public function recurringConcludesOn(): ?DateTime {
// retrieve rrule conclusion date
$rrule = $this->rruleIterator->concludes();
// evaluate if rrule conclusion is null
// if this is null that means the recurrence is infinate
// if this is null that means the recurrence is infinite
if ($rrule === null) {
return null;
}
Expand Down Expand Up @@ -465,7 +465,7 @@ public function recurringDaysOfWeek(): array {
public function recurringDaysOfWeekNamed(): array {
// evaluate if RRULE exists and extract day(s) of the week
$days = $this->rruleIterator !== null ? $this->rruleIterator->daysOfWeek() : [];
// convert numberic month to month name
// convert numeric month to month name
foreach ($days as $key => $value) {
$days[$key] = $this->dayNamesMap[$value];
}
Expand Down Expand Up @@ -531,7 +531,7 @@ public function recurringWeeksOfMonth(): array {
public function recurringWeeksOfMonthNamed(): array {
// evaluate if RRULE exists and extract relative position(s)
$positions = $this->rruleIterator?->isRelative() ? $this->rruleIterator->relativePosition() : [];
// convert numberic relative position to relative label
// convert numeric relative position to relative label
foreach ($positions as $key => $value) {
$positions[$key] = $this->relativePositionNamesMap[$value];
}
Expand Down Expand Up @@ -582,7 +582,7 @@ public function recurringMonthsOfYear(): array {
public function recurringMonthsOfYearNamed(): array {
// evaluate if RRULE exists and extract month(s) of the year
$months = $this->rruleIterator !== null ? $this->rruleIterator->monthsOfYear() : [];
// convert numberic month to month name
// convert numeric month to month name
foreach ($months as $key => $value) {
$months[$key] = $this->monthNamesMap[$value];
}
Expand Down Expand Up @@ -618,7 +618,7 @@ public function recurringRelativePosition(): array {
public function recurringRelativePositionNamed(): array {
// evaluate if RRULE exists and extract relative position(s)
$positions = $this->rruleIterator?->isRelative() ? $this->rruleIterator->relativePosition() : [];
// convert numberic relative position to relative label
// convert numeric relative position to relative label
foreach ($positions as $key => $value) {
$positions[$key] = $this->relativePositionNamesMap[$value];
}
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/EventReaderRRule.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function concludes(): ?DateTime {
while ($this->counter <= ($this->count - 2)) {
$this->next();
}
// temporarly store last reccurance date
// temporary store last reccurance date
$lastReccuranceDate = $this->currentDate;
// restore current recurrence date and counter
$this->currentDate = $currentReccuranceDate;
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getValue() {
* The parent of the current element is responsible for writing a
* containing element.
*
* This allows serializers to be re-used for different element names.
* This allows serializers to be reused for different element names.
*
* If you are opening new elements, you must also close them again.
*
Expand Down
4 changes: 2 additions & 2 deletions apps/dav/lib/CalDAV/Schedule/IMipService.php
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ public function generateWhenStringRecurringMonthly(EventReader $er): string {
// generate localized when string
// TRANSLATORS
// Indicates when a calendar event will happen, shown on invitation emails
// Output produced in order, output varies depending on if the event is absolute or releative:
// Output produced in order, output varies depending on if the event is absolute or relative:
// Absolute: Every Month on the 1, 8 for the entire day
// Relative: Every Month on the First Sunday, Saturday for the entire day
// Absolute: Every Month on the 1, 8 for the entire day until December 31, 2024
Expand Down Expand Up @@ -589,7 +589,7 @@ public function generateWhenStringRecurringYearly(EventReader $er): string {
// generate localized when string
// TRANSLATORS
// Indicates when a calendar event will happen, shown on invitation emails
// Output produced in order, output varies depending on if the event is absolute or releative:
// Output produced in order, output varies depending on if the event is absolute or relative:
// Absolute: Every Year in July on the 1st for the entire day
// Relative: Every Year in July on the First Sunday, Saturday for the entire day
// Absolute: Every Year in July on the 1st for the entire day until July 31, 2026
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/Status/StatusService.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public function processCalendarStatus(string $userId): void {
return;
}

// Only update the status if it's neccesary otherwise we mess up the timestamp
// Only update the status if it's necessary otherwise we mess up the timestamp
if ($currentStatus === null || $currentStatus->getMessageId() !== IUserStatus::MESSAGE_CALENDAR_BUSY) {
// One event that fulfills all status conditions is enough
// 1. Not an OOO event
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Comments/CommentNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static function getPropertyNames() {
'{http://owncloud.org/ns}latestChildDateTime',
'{http://owncloud.org/ns}objectType',
'{http://owncloud.org/ns}objectId',
// re-used property names are defined as constants
// reused property names are defined as constants
self::PROPERTY_NAME_MESSAGE,
self::PROPERTY_NAME_ACTOR_DISPLAYNAME,
self::PROPERTY_NAME_UNREAD,
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/ChecksumList.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function __construct(string $checksum) {
* The parent of the current element is responsible for writing a
* containing element.
*
* This allows serializers to be re-used for different element names.
* This allows serializers to be reused for different element names.
*
* If you are opening new elements, you must also close them again.
*
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/Directory.php
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ public function getQuotaInfo() {
/**
* Moves a node into this collection.
*
* It is up to the implementors to:
* It is up to the implementers to:
* 1. Create the new resource.
* 2. Remove the old resource.
* 3. Transfer any properties or other data.
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ private function getPartFileBasePath($path) {
return substr($path, 0, strlen($path) - strlen($filename)) . $hashedFilename;
} else {
// will place the .part file in the users root directory
// therefor we need to make the name (semi) unique - hash does not need to be secure but fast.
// therefore we need to make the name (semi) unique - hash does not need to be secure but fast.
return hash('xxh128', $path);
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/Node.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public function getDavPermissions(): string {
}

/**
* Returns the DAV Permissions with share and mount infromation stripped.
* Returns the DAV Permissions with share and mount information stripped.
*/
public function getPublicDavPermissions(): string {
return str_replace(['S', 'M'], '', $this->getDavPermissions());
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/TagList.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static function xmlDeserialize(Reader $reader) {
* The parent of the current element is responsible for writing a
* containing element.
*
* This allows serializers to be re-used for different element names.
* This allows serializers to be reused for different element names.
*
* If you are opening new elements, you must also close them again.
*
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/DAV/Sharing/Xml/Invite.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function getValue() {
* The parent of the current element is responsible for writing a
* containing element.
*
* This allows serializers to be re-used for different element names.
* This allows serializers to be reused for different element names.
*
* If you are opening new elements, you must also close them again.
*
Expand Down
6 changes: 3 additions & 3 deletions apps/dav/src/components/AbsenceForm.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ afterEach(() => {
})

function getInputs(wrapper) {
const lables = wrapper.findAll('label')
const labels = wrapper.findAll('label')

const firstDayLabel = lables.find((l) => l.text() === 'First day')
const firstDayLabel = labels.find((l) => l.text() === 'First day')
const firstDayInput = wrapper.get(`#${firstDayLabel.attributes('for')}`)

const lastDayLabel = lables.find((l) => l.text() === 'Last day (inclusive)')
const lastDayLabel = labels.find((l) => l.text() === 'Last day (inclusive)')
const lastDayInput = wrapper.get(`#${lastDayLabel.attributes('for')}`)

return { firstDayInput, lastDayInput }
Expand Down
2 changes: 1 addition & 1 deletion core/Command/Background/JobWorker.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$job->start($this->jobList);
$timeSpent = microtime(true) - $startTime;
$jobMemoryPeak = memory_get_peak_usage();
// TODO Job failure will never be catched here because exceptions are catched within $job->start method
// TODO Job failure will never be caught here because exceptions are caught within $job->start method
// The error will only be visible in server logs.
// It should be a temporary state until a proper job runner is implemented.
$this->jobRuns->finished($jobRunId, (int)($timeSpent * 1000), (int)($jobMemoryPeak / 1024));
Expand Down
2 changes: 1 addition & 1 deletion core/Service/LoginFlowV2Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function getByLoginToken(string $loginToken): LoginFlowV2 {

/**
* @param string $loginToken
* @return bool returns true if the start was successfull. False if not.
* @return bool returns true if the start was successful. False if not.
*/
public function startLoginFlow(string $loginToken): bool {
try {
Expand Down
6 changes: 3 additions & 3 deletions core/css/apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ kbd {
}
}

/* popover fix the flex positionning of the li parent */
/* popover fix the flex positioning of the li parent */
> .app-navigation-entry-menu {
top: var(--default-clickable-area);
}
Expand Down Expand Up @@ -571,7 +571,7 @@ kbd {
height: 38px;
&:hover,
&:focus {
/* overlapp borders */
/* overlap borders */
z-index: 1;
}
}
Expand Down Expand Up @@ -779,7 +779,7 @@ $min-content-width: variables.$breakpoint-mobile - variables.$navigation-width -
/* APP-SIDEBAR ------------------------------------------------------------ */
/*
Sidebar: a sidebar to be used within #content
#app-content will be shrinked properly
#app-content will be shrunk properly
*/
#app-sidebar {
width: 27vw;
Expand Down
2 changes: 1 addition & 1 deletion core/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
padding-inline-end: 5px;
overflow: hidden;
text-overflow: ellipsis;
// Take full width to push the header-shared-by bellow (if any)
// Take full width to push the header-shared-by below (if any)
flex: 1 1 100%;

// container for the public template header information
Expand Down
4 changes: 2 additions & 2 deletions core/src/OC/dialogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ const Dialogs = {
* @param {boolean} [_modal] do not use
* @param {string} [type] Type of file picker : Choose, copy, move, copy and move
* @param {string} [path] path to the folder that the the file can be picket from
* @param {object} [options] additonal options that need to be set
* @param {object} [options] additional options that need to be set
* @param {Function} [options.filter] filter function for advanced filtering
* @param {boolean} [options.allowDirectoryChooser] Allow to select directories
* @deprecated since 27.1.0 use the filepicker from `@nextcloud/dialogs` instead
Expand Down Expand Up @@ -245,7 +245,7 @@ const Dialogs = {
}

/**
* Coverting a Node into a legacy file info to support the OC.dialogs.filepicker filter function
* Converting a Node into a legacy file info to support the OC.dialogs.filepicker filter function
*
* @param node The node to convert
*/
Expand Down
12 changes: 6 additions & 6 deletions core/src/OC/msg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { t } from '@nextcloud/l10n'
*/
export default {
/**
* Displayes a "Saving..." message in the given message placeholder
* Displays a "Saving..." message in the given message placeholder
*
* @param selector - Query selectior for the element to display the message in
*/
Expand All @@ -21,7 +21,7 @@ export default {
},

/**
* Displayes a custom message in the given message placeholder
* Displays a custom message in the given message placeholder
*
* @param selector - Query selectior for the element to display the message in
* @param message - Plain text message to display (no HTML allowed)
Expand All @@ -40,7 +40,7 @@ export default {
},

/**
* Displayes an success/error message in the given selector
* Displays an success/error message in the given selector
*
* @param selector - Query selectior for the element to display the message in
* @param response - Response of the server
Expand All @@ -53,7 +53,7 @@ export default {
},

/**
* Displayes an success/error message in the given selector
* Displays an success/error message in the given selector
*
* @param selector - Query selector for the element to display the message in
* @param response - Response of the server
Expand All @@ -70,7 +70,7 @@ export default {
},

/**
* Displayes an success message in the given selector
* Displays an success message in the given selector
*
* @param selector - Query selector for the element to display the message in
* @param message - Plain text success message to display (no HTML allowed)
Expand Down Expand Up @@ -121,7 +121,7 @@ export default {
},

/**
* Displayes an error message in the given selector
* Displays an error message in the given selector
*
* @param selector - Query selector for the element to display the message in
* @param message - Plain text error message to display (no HTML allowed)
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/AppMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default defineComponent({
// `placement: bottom-start` swaps the anchor edge under RTL but the
// skidding sign isn't auto-mirrored, so we flip it here. Snapshot
// at init: Nextcloud's language doesn't change at runtime.
popoverSkidding: isRTL() ? 82 : -82, // thats the width of the product logo + main container margin
popoverSkidding: isRTL() ? 82 : -82, // that's the width of the product logo + main container margin
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function clearAndCloseSearch() {
padding-inline: var(--border-width-input-focused);
// hide the overflow - needed for the transition
overflow: hidden;
// Ensure the position is fixed also during "position: absolut" (transition)
// Ensure the position is fixed also during "position: absolute" (transition)
inset-inline-end: 0;

#{&} &__global-search {
Expand Down
2 changes: 1 addition & 1 deletion core/src/session-heartbeat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function registerAutoLogout() {
const timeout = Date.now() - (sessionLifetime ?? 86400) * 1000
if (lastActive < timeout) {
clearTimeout(intervalId)
logger.info('Inactivity timout reached, logging out')
logger.info('Inactivity timeout reached, logging out')
const logoutUrl = generateUrl('/logout') + '?requesttoken=' + encodeURIComponent(getRequestToken())
window.location.href = logoutUrl
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/types/navigation.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface INavigationEntry {
name: string
/** Whether this is the default app */
default?: boolean
/** App that registered this navigation entry (not necessarly the same as the id) */
/** App that registered this navigation entry (not necessarily the same as the id) */
app?: string
/** If this app has unread notification */
unread: number
Expand Down
2 changes: 1 addition & 1 deletion core/src/views/LegacyUnifiedSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export default {
},

mounted() {
// subscribe in mounted, as onNavigationChange relys on $el
// subscribe in mounted, as onNavigationChange relies on $el
subscribe('files:navigation:changed', this.onNavigationChange)

if (OCP.Accessibility.disableKeyboardShortcuts()) {
Expand Down
4 changes: 2 additions & 2 deletions dist/core-legacy-unified-search.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-legacy-unified-search.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-login.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-unified-search.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unified-search.js.map

Large diffs are not rendered by default.

Loading