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 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