Skip to content
This repository was archived by the owner on Aug 4, 2026. It is now read-only.
Merged
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
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
target-branch: "development"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
cooldown:
default-days: 1
include:
- "*"
exclude:
- "@conduction/*"
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
quality:
uses: ConductionNL/.github/.github/workflows/quality.yml@main
with:
app-name: app-template
app-name: deskdesk
php-version: "8.3"
php-test-versions: '["8.3", "8.4"]'
nextcloud-test-refs: '["stable31", "stable32", "stable33"]'
Expand Down
4 changes: 4 additions & 0 deletions .license-overrides.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"pako": "License is (MIT AND Zlib) — both are approved open-source licenses on the default allowlist; transitive dep via webpack/babel toolchain; compound AND expression not parsed by checker",
"sha.js": "License is (MIT AND BSD-3-Clause) — both are approved open-source licenses on the default allowlist; transitive dep via webpack/babel toolchain; compound AND expression not parsed by checker"
}
10 changes: 10 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Supply-chain hardening: reject any npm package published less than
# 24h ago. Compromised first-party-Conduction packages are excluded via
# Dependabot cooldown (.github/dependabot.yml); for fresh @conduction/*
# releases, override per-install with `npm install --min-release-age=0`.
min-release-age=1

# Peer-dep resolution: vue-apexcharts@1.7.0 declares peer
# apexcharts@>=4.x but the app pins apexcharts@^3.54.1 for Vue 2
# compatibility. Allow installs to proceed without strict peer matching.
legacy-peer-deps=true
2 changes: 1 addition & 1 deletion docs/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ const WIDGETS = [
export default function Home() {
return (
<Layout
title="DeskDesk"
title="DeskDesk, flexible desk booking on Nextcloud"
description="DeskDesk runs flexible desk booking for open-office environments — pick a desk on a floor, book a slot, sync to Nextcloud Calendar, and surface booking how-tos from the company wiki."
>
<main className="marketing-page">
Expand Down
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ module.exports = defineConfig([{
'vue/first-attribute-linebreak': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'n/no-missing-import': 'off',
'import/named': 'off', // disable: trips on exports-map subpaths inside @conduction/nextcloud-vue's nested @nextcloud/vue install
'import/namespace': 'off', // disable namespace checking to avoid parser requirement
'import/default': 'off', // disable default import checking to avoid parser requirement
'import/no-named-as-default': 'off', // disable named-as-default checking to avoid parser requirement
Expand Down
2 changes: 1 addition & 1 deletion img/app-store.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 9 additions & 7 deletions lib/Service/SettingsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@

try {
$registerMapper = $this->container->get('OCA\OpenRegister\Db\RegisterMapper');
$register = $registerMapper->find(self::REGISTER_SLUG);
$registerId = (int) $register->getId();
$register = $registerMapper->find(self::REGISTER_SLUG);
$registerId = (int) $register->getId();
} catch (\Throwable $e) {
// Register isn't imported yet; that's expected on first boot
// before the repair step has run. Log at debug level so the
Expand Down Expand Up @@ -239,12 +239,14 @@
// Resolve the bundled register file relative to the Nextcloud root,
// matching ConfigurationService::importFromFilePath's expectation
// (path relative to /var/www/html).
$appPath = (string) $this->appManager->getAppPath(Application::APP_ID);
$appPath = (string) $this->appManager->getAppPath(Application::APP_ID);
$absolute = $appPath.'/lib/Settings/deskdesk_register.json';
$ncRoot = \OC::$SERVERROOT;
$relative = (str_starts_with($absolute, $ncRoot.'/') === true)
? substr($absolute, strlen($ncRoot) + 1)
: ltrim($absolute, '/');
$ncRoot = \OC::$SERVERROOT;

Check failure on line 244 in lib/Service/SettingsService.php

View workflow job for this annotation

GitHub Actions / quality / PHP Quality (phpstan)

Access to static property $SERVERROOT on an unknown class OC.

Check failure on line 244 in lib/Service/SettingsService.php

View workflow job for this annotation

GitHub Actions / quality / PHP Quality (phpstan)

Access to static property $SERVERROOT on an unknown class OC.
if (str_starts_with($absolute, $ncRoot.'/') === true) {
$relative = substr($absolute, strlen($ncRoot) + 1);
} else {
$relative = ltrim($absolute, '/');
}

$version = '0.2.0';
if (file_exists($absolute) === true) {
Expand Down
Loading
Loading