Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0ec54ae
chore(release): sync beta back into development
github-actions[bot] Aug 30, 2026
0b18884
chore(sync): carry beta back into development
github-actions[bot] Aug 30, 2026
3505e88
Merge pull request #3151 from ConductionNL/sync/beta-to-development-2…
rubenvdlinde Aug 30, 2026
5b76df1
chore(deps): bump css-loader from 7.1.4 to 7.1.5 (#3168)
dependabot[bot] Aug 30, 2026
41e94d6
chore(deps): bump web-token/jwt-library from 4.1.9 to 4.2.1 (#3165)
dependabot[bot] Aug 30, 2026
f97fe93
chore(deps-dev): bump phpcsstandards/phpcsextra from 1.5.0 to 1.5.1 (…
dependabot[bot] Aug 30, 2026
78758a3
chore(deps): bump @nextcloud/dialogs from 7.4.1 to 7.5.0 (#3156)
dependabot[bot] Aug 30, 2026
419651b
chore(deps): bump vue-router from 5.2.0 to 5.3.0 (#3154)
dependabot[bot] Aug 30, 2026
6cf443d
chore(deps): bump vue from 3.5.41 to 3.5.42 (#3152)
dependabot[bot] Aug 30, 2026
7e8955c
chore(dependabot): hold back vue-router 5 as well (#3172)
rubenvdlinde Aug 30, 2026
2ce0ca6
docs(dependabot): correct the vue-router holdback to what was measure…
rubenvdlinde Aug 30, 2026
dbe6f6b
chore(deps-dev): bump @typescript-eslint/parser from 8.67.0 to 8.68.0…
dependabot[bot] Aug 30, 2026
d157872
fix(aggregation): count the objects that have no organisation (#3180)
rubenvdlinde Aug 31, 2026
62d1b16
chore(deps): take @conduction/nextcloud-vue 2.25.1 for the KPI card (…
rubenvdlinde Aug 31, 2026
ddc7fd7
feat(organisation): let an organisation be a federated counterparty, …
rubenvdlinde Aug 31, 2026
189d80c
chore(deps): bump minishlink/web-push from 9.0.4 to 11.0.0 (#3160)
dependabot[bot] Aug 31, 2026
726a1b6
feat(dmn): give the fleet one decision-table evaluator (#3186)
rubenvdlinde Aug 31, 2026
c812b50
chore(deps-dev): bump jest-environment-jsdom from 29.7.0 to 30.5.0 (#…
dependabot[bot] Aug 31, 2026
cdd2139
chore(deps-dev): bump @types/node from 20.19.43 to 26.4.0 (#3164)
dependabot[bot] Aug 31, 2026
8143166
fix(dmn): alias declared column types onto the evaluator's vocabulary…
rubenvdlinde Aug 31, 2026
64caf83
Merge pull request #3149 from ConductionNL/sync/beta-to-development-2…
rubenvdlinde Aug 31, 2026
2680220
chore(release): 2.0.5-unstable.20260831053109 (#3193)
github-actions[bot] Aug 31, 2026
fe30573
chore(deps): take @conduction/nextcloud-vue 2.27.0 (#3194)
rubenvdlinde Aug 31, 2026
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
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ updates:
ignore:
- dependency-name: "typescript"
update-types: ["version-update:semver-major"]
# vue-router 5 peers `vite: ^7.3.0 || ^8.0.0` and expects a Vite
# toolchain. Measured, not assumed, and the result is SPLIT: integriq and
# zaakafhandelapp fail their build on `Can't resolve 'vue-router'`, while
# openregister and learniq build clean on 5.3.0. Held because a bump that
# breaks some apps and not others cannot be merged unattended, and the
# difference is not yet understood. Adopting it fleet-wide is a
# Vite migration, not a bump. versioniq is already on Vite and is the
# natural pilot.
- dependency-name: "vue-router"
update-types: ["version-update:semver-major"]
- dependency-name: "webpack-cli"
update-types: ["version-update:semver-major"]
- dependency-name: "@babel/core"
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Open Register drijft apps zoals OpenCatalogi, Procest, Pipelinq en Software Cata

Vrij en open source onder de EUPL-licentie.
]]></description>
<version>1.1.15-unstable.20260830153944</version>
<version>2.0.5-unstable.20260831053109</version>
<licence>EUPL-1.2</licence>
<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
<namespace>OpenRegister</namespace>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"elasticsearch/elasticsearch": "^v9.5.0",
"guzzlehttp/guzzle": "^7.0",
"jwadhams/json-logic-php": "^1.5",
"minishlink/web-push": "^9.0",
"minishlink/web-push": "^11.0",
"opis/json-schema": "^2.3",
"phpoffice/phpspreadsheet": "^5.0",
"phpoffice/phpword": "^1.2",
Expand Down
97 changes: 55 additions & 42 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion lib/BackgroundJob/TenantDeprovisionJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ protected function run(mixed $argument): void {
$this->logger->info('[TenantDeprovisionJob] Starting deprovisioning check');

try {
$organisations = $this->organisationMapper->findAll(
// Tenant-scoped read, not findAll: a federated counterparty is an
// organisation in this table but NOT a tenant of this installation, and
// selecting on status alone would sweep it up with the tenants.
$organisations = $this->organisationMapper->findLocalTenants(
filters: ['status' => TenantLifecycleService::STATUS_DEPROVISIONING]
);
} catch (\Exception $e) {
Expand Down
5 changes: 4 additions & 1 deletion lib/BackgroundJob/TenantPurgeJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ protected function run(mixed $argument): void {
$cutoffDate->sub(new DateInterval("P{$retentionDays}D"));

try {
$organisations = $this->organisationMapper->findAll(
// Tenant-scoped read, not findAll: a federated counterparty is an
// organisation in this table but NOT a tenant of this installation, and
// selecting on status alone would sweep it up with the tenants.
$organisations = $this->organisationMapper->findLocalTenants(
filters: ['status' => TenantLifecycleService::STATUS_ARCHIVED]
);
} catch (\Exception $e) {
Expand Down
5 changes: 4 additions & 1 deletion lib/BackgroundJob/TenantUsageSyncJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ protected function run(mixed $argument): void {
$this->logger->debug('[TenantUsageSyncJob] Starting usage sync');

try {
$organisations = $this->organisationMapper->findAll(
// Tenant-scoped read, not findAll: a federated counterparty is an
// organisation in this table but NOT a tenant of this installation, and
// selecting on status alone would sweep it up with the tenants.
$organisations = $this->organisationMapper->findLocalTenants(
filters: ['status' => TenantLifecycleService::STATUS_ACTIVE]
);
} catch (\Exception $e) {
Expand Down
Loading
Loading