Merge branch 'main' into dev

Replace broken JavaScript onclick toggle with native HTML
<details>/<summary> element. Works without JS, accessible,
and styled as a Fomantic UI button.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

models/licenses/update_stream_config.go

@@ -24,6 +24,8 @@ type UpdateStreamConfig struct {
 	OwnerID     int64              `xorm:"INDEX NOT NULL"`         // org or user
 	RepoID      int64              `xorm:"INDEX NOT NULL DEFAULT 0"` // 0 = org-level default
 	StreamMode  string             `xorm:"NOT NULL DEFAULT 'joomla'"` // joomla, custom
+	Platform    string             `xorm:"NOT NULL DEFAULT 'joomla'"` // joomla, dolibarr, both
+	RequireKey  bool               `xorm:"NOT NULL DEFAULT false"`    // require license key for update feed
 	// CustomStreams is a JSON array of stream definitions.
 	// Each entry: {"name":"lts","suffix":"-lts","description":"Long-term support"}
 	CustomStreams string            `xorm:"TEXT"`

models/migrations/migrations.go

@@ -414,6 +414,8 @@ func prepareMigrationTasks() []*migration {
 		newMigration(334, "Add actions user whitelist to protected branches", v1_27.AddActionsUserWhitelistToProtectedBranch),
 		newMigration(335, "Add license key tables for update server", v1_27.AddLicenseKeyTables),
 		newMigration(336, "Add update stream config table", v1_27.AddUpdateStreamConfigTable),
+		newMigration(337, "Add key_plain column to license_key", v1_27.AddKeyPlainToLicenseKey),
+		newMigration(338, "Add platform and require_key to update_stream_config", v1_27.AddPlatformAndRequireKeyToStreamConfig),
 	}
 	return preparedMigrations
 }

models/migrations/v1_27/v337.go

@@ -0,0 +1,20 @@
+// Copyright 2026 Moko Consulting <hello@mokoconsulting.tech>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package v1_27
+
+import "xorm.io/xorm"
+
+type licenseKey337 struct {
+	ID       int64  `xorm:"pk autoincr"`
+	KeyPlain string `xorm:""`
+}
+
+func (licenseKey337) TableName() string {
+	return "license_key"
+}
+
+// AddKeyPlainToLicenseKey adds the key_plain column to license_key table.
+func AddKeyPlainToLicenseKey(x *xorm.Engine) error {
+	return x.Sync(new(licenseKey337))
+}

models/migrations/v1_27/v338.go

@@ -0,0 +1,22 @@
+// Copyright 2026 Moko Consulting <hello@mokoconsulting.tech>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package v1_27
+
+import "xorm.io/xorm"
+
+type updateStreamConfig338 struct {
+	ID         int64  `xorm:"pk autoincr"`
+	Platform   string `xorm:"NOT NULL DEFAULT 'joomla'"`
+	RequireKey bool   `xorm:"NOT NULL DEFAULT false"`
+}
+
+func (updateStreamConfig338) TableName() string {
+	return "update_stream_config"
+}
+
+// AddPlatformAndRequireKeyToStreamConfig adds platform and require_key
+// columns to update_stream_config.
+func AddPlatformAndRequireKeyToStreamConfig(x *xorm.Engine) error {
+	return x.Sync(new(updateStreamConfig338))
+}

options/locale/locale_en-US.json

@@ -2147,7 +2147,10 @@
   "repo.settings.unit_visibility": "Visibility",
   "repo.settings.unit_visibility_private": "Private (follow repo visibility)",
   "repo.settings.unit_visibility_public": "Public (anyone can read)",
-  "repo.settings.unit_visibility_releases_help": "Update feeds (updates.xml, dolibarr.json) are always accessible regardless of this setting. Set to Public to also show the releases page to anonymous visitors.",
+  "repo.settings.unit_visibility_releases_help": "Controls whether the releases page is visible to anonymous visitors.",
+  "repo.settings.update_platform": "Update Server Platform",
+  "repo.settings.update_platform_both": "Both (Joomla + Dolibarr)",
+  "repo.settings.require_update_key": "Require license key for update feed access",
   "repo.settings.packages_desc": "Enable Repository Packages Registry",
   "repo.settings.projects_desc": "Enable Projects",
   "repo.settings.projects_mode_desc": "Projects Mode (which kinds of projects to show)",
@@ -2643,6 +2646,10 @@
   "repo.licenses.key_created": "License Key Created",
   "repo.licenses.key_created_copy": "Copy this key now. It will not be shown again.",
   "repo.licenses.revoke": "Revoke",
+  "repo.licenses.edit_package": "Edit License Package",
+  "repo.licenses.delete_package": "Delete Package",
+  "repo.licenses.package_updated": "License package updated.",
+  "repo.licenses.package_deleted": "License package deleted.",
   "repo.licenses.key_revoked": "License key revoked.",
   "repo.licenses.master_key_created": "Master License Key Created",
   "repo.licenses.master_key_created_copy": "This is your organization master key with unlimited access to all update channels. Copy it now — it will not be shown again.",

routers/web/org/licenses.go

@@ -67,6 +67,7 @@ func Licenses(ctx *context.Context) {
 	}
 	ctx.Data["LicenseKeys"] = keys
 	ctx.Data["IsRepoAdmin"] = ctx.Org.IsOwner
+	ctx.Data["IsSiteAdmin"] = ctx.IsUserSiteAdmin()
 
 	ctx.HTML(http.StatusOK, tplOrgLicenses)
 }

routers/web/org/update_streams.go

@@ -0,0 +1,57 @@
+// Copyright 2026 Moko Consulting <hello@mokoconsulting.tech>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package org
+
+import (
+	"net/http"
+
+	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/licenses"
+	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/templates"
+	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/services/context"
+)
+
+const tplSettingsUpdateStreams templates.TplName = "org/settings/update_streams"
+
+// SettingsUpdateStreams shows the org-level update stream settings.
+func SettingsUpdateStreams(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("org.settings.update_streams")
+	ctx.Data["PageIsOrgSettings"] = true
+	ctx.Data["PageIsSettingsUpdateStreams"] = true
+
+	orgID := ctx.Org.Organization.ID
+
+	cfg, err := licenses.GetOrgConfig(ctx, orgID)
+	if err != nil {
+		ctx.ServerError("GetOrgConfig", err)
+		return
+	}
+	ctx.Data["StreamConfig"] = cfg
+	ctx.Data["EffectiveStreams"] = cfg.GetActiveStreams()
+
+	ctx.HTML(http.StatusOK, tplSettingsUpdateStreams)
+}
+
+// SettingsUpdateStreamsPost saves the org-level update stream settings.
+func SettingsUpdateStreamsPost(ctx *context.Context) {
+	orgID := ctx.Org.Organization.ID
+
+	cfg := &licenses.UpdateStreamConfig{
+		OwnerID:      orgID,
+		RepoID:       0,
+		StreamMode:   ctx.FormString("stream_mode"),
+		CustomStreams: ctx.FormString("custom_streams"),
+	}
+
+	if cfg.StreamMode == "" {
+		cfg.StreamMode = "joomla"
+	}
+
+	if err := licenses.SaveConfig(ctx, cfg); err != nil {
+		ctx.ServerError("SaveConfig", err)
+		return
+	}
+
+	ctx.Flash.Success(ctx.Tr("org.settings.update_streams_saved"))
+	ctx.Redirect(ctx.Org.OrgLink + "/settings/update-streams")
+}

routers/web/repo/licenses.go

@@ -179,3 +179,64 @@ func LicensesRevokeKey(ctx *context.Context) {
 	ctx.Flash.Success(ctx.Tr("repo.licenses.key_revoked"))
 	ctx.Redirect(ctx.Repo.RepoLink + "/licenses")
 }
+
+const tplLicensesEditPackage templates.TplName = "repo/licenses_edit_package"
+
+// LicensesEditPackage shows the edit form for a license package.
+func LicensesEditPackage(ctx *context.Context) {
+	pkgID := ctx.PathParamInt64("id")
+	pkg, err := licenses.GetLicensePackageByID(ctx, pkgID)
+	if err != nil {
+		ctx.ServerError("GetLicensePackageByID", err)
+		return
+	}
+
+	ctx.Data["Title"] = ctx.Tr("repo.licenses.edit_package")
+	ctx.Data["PageIsLicenses"] = true
+	ctx.Data["IsLicensesPage"] = true
+	ctx.Data["Package"] = pkg
+	ctx.HTML(http.StatusOK, tplLicensesEditPackage)
+}
+
+// LicensesEditPackagePost saves edits to a license package.
+func LicensesEditPackagePost(ctx *context.Context) {
+	pkgID := ctx.PathParamInt64("id")
+	pkg, err := licenses.GetLicensePackageByID(ctx, pkgID)
+	if err != nil {
+		ctx.ServerError("GetLicensePackageByID", err)
+		return
+	}
+
+	pkg.Name = ctx.FormString("name")
+	pkg.Description = ctx.FormString("description")
+	durationDays, _ := strconv.Atoi(ctx.FormString("duration_days"))
+	pkg.DurationDays = durationDays
+	maxSites, _ := strconv.Atoi(ctx.FormString("max_sites"))
+	pkg.MaxSites = maxSites
+	pkg.AllowedChannels = ctx.FormString("allowed_channels")
+	pkg.IsActive = ctx.FormString("is_active") == "on"
+
+	if err := licenses.UpdateLicensePackage(ctx, pkg); err != nil {
+		ctx.ServerError("UpdateLicensePackage", err)
+		return
+	}
+
+	ctx.Flash.Success(ctx.Tr("repo.licenses.package_updated"))
+	ctx.Redirect(ctx.Repo.RepoLink + "/licenses")
+}
+
+// LicensesDeletePackage deletes a license package. Site admin only.
+func LicensesDeletePackage(ctx *context.Context) {
+	if !ctx.IsUserSiteAdmin() {
+		ctx.NotFound(nil)
+		return
+	}
+	pkgID := ctx.PathParamInt64("id")
+	if err := licenses.DeleteLicensePackage(ctx, pkgID); err != nil {
+		ctx.ServerError("DeleteLicensePackage", err)
+		return
+	}
+
+	ctx.Flash.Success(ctx.Tr("repo.licenses.package_deleted"))
+	ctx.Redirect(ctx.Repo.RepoLink + "/licenses")
+}

routers/web/repo/setting/setting.go

@@ -12,6 +12,7 @@ import (
 
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/db"
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/organization"
+	licenses_model "git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/licenses"
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/perm"
 	repo_model "git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/repo"
 	unit_model "git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/unit"
@@ -100,6 +101,8 @@ func SettingsCtxData(ctx *context.Context) {
 
 // Settings show a repository's settings page
 func Settings(ctx *context.Context) {
+	repoCfg, _ := licenses_model.GetRepoConfig(ctx, ctx.Repo.Repository.ID)
+	ctx.Data["RepoUpdateConfig"] = repoCfg
 	ctx.HTML(http.StatusOK, tplSettingsOptions)
 }
 
@@ -672,6 +675,22 @@ func handleSettingsPostAdvanced(ctx *context.Context) {
 			return
 		}
 	}
+	// Save update server platform and require-key settings.
+	updatePlatform := form.UpdatePlatform
+	if updatePlatform == "" {
+		updatePlatform = "joomla"
+	}
+	updateCfg := &licenses_model.UpdateStreamConfig{
+		OwnerID:    repo.OwnerID,
+		RepoID:     repo.ID,
+		Platform:   updatePlatform,
+		RequireKey: form.RequireUpdateKey,
+		StreamMode: "joomla", // inherit org default
+	}
+	if err := licenses_model.SaveConfig(ctx, updateCfg); err != nil {
+		log.Error("SaveConfig: %v", err)
+	}
+
 	log.Trace("Repository advanced settings updated: %s/%s", ctx.Repo.Owner.Name, repo.Name)
 
 	ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success"))

routers/web/repo/updateserver.go

@@ -23,7 +23,13 @@ func validateUpdateKey(ctx *context.Context) (allowedChannels []string, ok bool)
 	}
 
 	if rawKey == "" {
-		// No key provided — allow public access (all channels).
+		// Check if this repo requires a key for update feed access.
+		repoCfg, _ := licenses.GetRepoConfig(ctx, ctx.Repo.Repository.ID)
+		if repoCfg != nil && repoCfg.RequireKey {
+			// Key required but not provided — return empty.
+			return nil, false
+		}
+		// No key required — allow public access (all channels).
 		return nil, true
 	}
 

routers/web/web.go

@@ -1057,6 +1057,11 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) {
 					m.Get("", org.BlockedUsers)
 					m.Post("", web.Bind(forms.BlockUserForm{}), org.BlockedUsersPost)
 				})
+
+				m.Group("/update-streams", func() {
+					m.Get("", org.SettingsUpdateStreams)
+					m.Post("", org.SettingsUpdateStreamsPost)
+				})
 			}, ctxDataSet("EnableOAuth2", setting.OAuth2.Enabled, "EnablePackages", setting.Packages.Enabled, "PageIsOrgSettings", true))
 		}, context.OrgAssignment(context.OrgAssignmentOptions{RequireOwner: true}))
 	}, reqSignIn)
@@ -1512,6 +1517,9 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) {
 	m.Group("/{username}/{reponame}/licenses", func() {
 		m.Get("", repo.Licenses)
 		m.Post("/packages", repo.LicensesCreatePackage)
+		m.Get("/packages/{id}/edit", repo.LicensesEditPackage)
+		m.Post("/packages/{id}/edit", repo.LicensesEditPackagePost)
+		m.Post("/packages/{id}/delete", repo.LicensesDeletePackage)
 		m.Post("/keys/generate", repo.LicensesGenerateKey)
 		m.Post("/keys/{id}/revoke", repo.LicensesRevokeKey)
 	}, optSignIn, context.RepoAssignment)

services/context/repo.go

@@ -613,6 +613,15 @@ func repoAssignmentPrepareTemplateData(ctx *Context, data *repoAssignmentPrepare
 	ctx.Data["NumLicensePackages"] = numLicensePackages
 	ctx.Data["EnableLicenses"] = numLicensePackages > 0
 	ctx.Data["IsRepoAdmin"] = ctx.Repo.Permission.IsAdmin()
+	ctx.Data["IsSiteAdmin"] = ctx.IsUserSiteAdmin()
+
+	// Load repo update config for platform-aware UI.
+	repoUpdateCfg, _ := licenses_model.GetRepoConfig(ctx, repo.ID)
+	if repoUpdateCfg != nil {
+		ctx.Data["RepoUpdatePlatform"] = repoUpdateCfg.Platform
+	} else {
+		ctx.Data["RepoUpdatePlatform"] = "joomla"
+	}
 
 	ctx.Data["Title"] = repo.Owner.Name + "/" + repo.Name
 	ctx.Data["PageTitleCommon"] = repo.Name + " - " + setting.AppName

services/forms/repo_form.go

@@ -133,6 +133,8 @@ type RepoSettingForm struct {
 
 	EnableReleases     bool
 	ReleasesVisibility string
+	UpdatePlatform     string
+	RequireUpdateKey   bool
 
 	EnablePackages     bool
 

templates/org/licenses.tmpl

@@ -19,49 +19,48 @@
 			</div>
 		{{end}}
 
-		<h4 class="ui top attached header tw-flex tw-justify-between tw-items-center">
-			<span>{{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.licenses.packages"}}</span>
-			{{if .IsRepoAdmin}}
-				<a class="ui small primary button" href="#new-package-form" onclick="this.parentElement.parentElement.nextElementSibling.querySelector('#new-package-form').style.display='block'; return false;">
-					{{ctx.Locale.Tr "repo.licenses.new_package"}}
-				</a>
-			{{end}}
+		<h4 class="ui top attached header">
+			{{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.licenses.packages"}}
 		</h4>
 		<div class="ui attached segment">
 			{{if .IsRepoAdmin}}
-				<div id="new-package-form" style="display: none;" class="tw-mb-4">
-					<form class="ui form" method="post" action="{{$.Org.HomeLink}}/-/licenses/packages">
-						{{.CsrfTokenHtml}}
-						<div class="two fields">
-							<div class="required field">
-								<label>{{ctx.Locale.Tr "repo.licenses.package_name"}}</label>
-								<input name="name" required placeholder="Pro Annual">
+				<details class="tw-mb-4">
+					<summary class="ui primary button">{{svg "octicon-plus" 14}} {{ctx.Locale.Tr "repo.licenses.new_package"}}</summary>
+					<div class="tw-mt-4">
+						<form class="ui form" method="post" action="{{$.Org.HomeLink}}/-/licenses/packages">
+							{{.CsrfTokenHtml}}
+							<div class="two fields">
+								<div class="required field">
+									<label>{{ctx.Locale.Tr "repo.licenses.package_name"}}</label>
+									<input name="name" required placeholder="e.g. Pro Annual, Basic Monthly">
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.description"}}</label>
+									<input name="description" placeholder="e.g. Annual pro subscription">
+								</div>
 							</div>
-							<div class="field">
-								<label>{{ctx.Locale.Tr "repo.licenses.description"}}</label>
-								<input name="description" placeholder="Annual pro subscription">
+							<div class="three fields">
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.duration"}} ({{ctx.Locale.Tr "repo.licenses.days"}})</label>
+									<input name="duration_days" type="number" value="0" min="0">
+									<p class="help">0 = {{ctx.Locale.Tr "repo.licenses.lifetime"}}</p>
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.max_sites"}}</label>
+									<input name="max_sites" type="number" value="0" min="0">
+									<p class="help">0 = unlimited</p>
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.channels"}}</label>
+									<input name="allowed_channels" placeholder="stable,release-candidate">
+									<p class="help">{{ctx.Locale.Tr "repo.licenses.channels_help"}}</p>
+								</div>
 							</div>
-						</div>
-						<div class="three fields">
-							<div class="field">
-								<label>{{ctx.Locale.Tr "repo.licenses.duration"}} ({{ctx.Locale.Tr "repo.licenses.days"}})</label>
-								<input name="duration_days" type="number" value="0" min="0">
-							</div>
-							<div class="field">
-								<label>{{ctx.Locale.Tr "repo.licenses.max_sites"}}</label>
-								<input name="max_sites" type="number" value="0" min="0">
-							</div>
-							<div class="field">
-								<label>{{ctx.Locale.Tr "repo.licenses.channels"}}</label>
-								<input name="allowed_channels" placeholder="stable,release-candidate">
-							</div>
-						</div>
-						<button class="ui primary button" type="submit">{{ctx.Locale.Tr "repo.licenses.create_package"}}</button>
-					</form>
-					<div class="divider"></div>
-				</div>
+							<button class="ui primary button" type="submit">{{ctx.Locale.Tr "repo.licenses.create_package"}}</button>
+						</form>
+					</div>
+				</details>
 			{{end}}
-
 			{{if .LicensePackages}}
 				<table class="ui table">
 					<thead>

templates/org/settings/navbar.tmpl

@@ -25,6 +25,9 @@
 			{{ctx.Locale.Tr "packages.title"}}
 		</a>
 		{{end}}
+		<a class="{{if .PageIsSettingsUpdateStreams}}active {{end}}item" href="{{.OrgLink}}/settings/update-streams">
+			{{ctx.Locale.Tr "org.settings.update_streams"}}
+		</a>
 		{{if .EnableActions}}
 		<details class="item toggleable-item" {{if or .PageIsOrgSettingsActionsGeneral .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}>
 			<summary>{{ctx.Locale.Tr "actions.actions"}}</summary>

templates/org/settings/update_streams.tmpl

@@ -0,0 +1,62 @@
+{{template "org/settings/layout_head" (dict "pageClass" "organization settings")}}
+<div class="org-setting-content">
+	<h4 class="ui top attached header">
+		{{ctx.Locale.Tr "org.settings.update_streams"}}
+	</h4>
+	<div class="ui attached segment">
+		<p>{{ctx.Locale.Tr "org.settings.update_streams_desc"}}</p>
+		<form class="ui form" method="post" action="{{.OrgLink}}/settings/update-streams">
+			{{.CsrfTokenHtml}}
+
+			<div class="grouped fields">
+				<label>{{ctx.Locale.Tr "org.settings.stream_mode"}}</label>
+				<div class="field">
+					<div class="ui radio checkbox">
+						<input name="stream_mode" type="radio" value="joomla" {{if or (eq .StreamConfig.StreamMode "") (eq .StreamConfig.StreamMode "joomla")}}checked{{end}}>
+						<label>{{ctx.Locale.Tr "org.settings.stream_mode_joomla"}}</label>
+					</div>
+				</div>
+				<div class="field">
+					<div class="ui radio checkbox">
+						<input name="stream_mode" type="radio" value="custom" {{if eq .StreamConfig.StreamMode "custom"}}checked{{end}}>
+						<label>{{ctx.Locale.Tr "org.settings.stream_mode_custom"}}</label>
+					</div>
+				</div>
+			</div>
+
+			<div class="field">
+				<label>{{ctx.Locale.Tr "org.settings.default_streams"}}</label>
+				<p class="help">{{ctx.Locale.Tr "org.settings.default_streams_joomla"}}</p>
+				<table class="ui small table">
+					<thead>
+						<tr>
+							<th>{{ctx.Locale.Tr "org.settings.stream_name"}}</th>
+							<th>{{ctx.Locale.Tr "org.settings.stream_suffix"}}</th>
+							<th>{{ctx.Locale.Tr "repo.licenses.description"}}</th>
+						</tr>
+					</thead>
+					<tbody>
+						{{range .EffectiveStreams}}
+							<tr>
+								<td><code>{{.Name}}</code></td>
+								<td>{{if .Suffix}}<code>{{.Suffix}}</code>{{else}}<em>(no suffix)</em>{{end}}</td>
+								<td>{{.Description}}</td>
+							</tr>
+						{{end}}
+					</tbody>
+				</table>
+			</div>
+
+			<div class="field">
+				<label>{{ctx.Locale.Tr "org.settings.custom_streams"}}</label>
+				<textarea name="custom_streams" rows="6" placeholder='[{"name":"lts","suffix":"-lts","description":"Long-term support"}]'>{{.StreamConfig.CustomStreams}}</textarea>
+				<p class="help">{{ctx.Locale.Tr "org.settings.custom_streams_help"}}</p>
+			</div>
+
+			<div class="field">
+				<button class="ui primary button">{{ctx.Locale.Tr "save"}}</button>
+			</div>
+		</form>
+	</div>
+</div>
+{{template "org/settings/layout_footer" .}}

templates/repo/licenses.tmpl

@@ -45,14 +45,25 @@
 								<td>{{.KeyCount}}</td>
 								<td>{{if .IsActive}}<span class="ui green label">{{ctx.Locale.Tr "repo.licenses.active"}}</span>{{else}}<span class="ui grey label">{{ctx.Locale.Tr "repo.licenses.inactive"}}</span>{{end}}</td>
 								{{if $.IsRepoAdmin}}
-									<td class="tw-text-right">
+									<td class="tw-text-right tw-flex tw-gap-1 tw-justify-end">
 										<form method="post" action="{{$.RepoLink}}/licenses/keys/generate" class="tw-inline">
 											{{$.CsrfTokenHtml}}
 											<input type="hidden" name="package_id" value="{{.ID}}">
-											<button class="ui tiny primary button" type="submit">
-												{{svg "octicon-plus" 14}} {{ctx.Locale.Tr "repo.licenses.generate_key"}}
+											<button class="ui tiny primary button" type="submit" title="{{ctx.Locale.Tr "repo.licenses.generate_key"}}">
+												{{svg "octicon-plus" 14}}
 											</button>
 										</form>
+										<a class="ui tiny button" href="{{$.RepoLink}}/licenses/packages/{{.ID}}/edit" title="{{ctx.Locale.Tr "repo.licenses.edit_package"}}">
+											{{svg "octicon-pencil" 14}}
+										</a>
+										{{if $.IsSiteAdmin}}
+										<form method="post" action="{{$.RepoLink}}/licenses/packages/{{.ID}}/delete" class="tw-inline" onsubmit="return confirm('Delete this package? This action cannot be undone.')">
+											{{$.CsrfTokenHtml}}
+											<button class="ui tiny red button" type="submit" title="{{ctx.Locale.Tr "repo.licenses.delete_package"}}">
+												{{svg "octicon-trash" 14}}
+											</button>
+										</form>
+										{{end}}
 									</td>
 								{{end}}
 							</tr>
@@ -70,41 +81,43 @@
 
 		{{/* ── Create New License Package ── */}}
 		{{if .IsRepoAdmin}}
-			<h4 class="ui top attached header tw-mt-4">
-				{{svg "octicon-plus" 16}} {{ctx.Locale.Tr "repo.licenses.create_new_package"}}
-			</h4>
-			<div class="ui attached segment">
-				<form class="ui form" method="post" action="{{.RepoLink}}/licenses/packages">
-					{{.CsrfTokenHtml}}
-					<div class="two fields">
-						<div class="required field">
-							<label>{{ctx.Locale.Tr "repo.licenses.package_name"}}</label>
-							<input name="name" required placeholder="e.g. Pro Annual, Basic Monthly">
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "repo.licenses.description"}}</label>
-							<input name="description" placeholder="e.g. Annual pro subscription with all channels">
-						</div>
+			<div class="tw-mt-4">
+				<details>
+					<summary class="ui primary button">{{svg "octicon-plus" 14}} {{ctx.Locale.Tr "repo.licenses.new_package"}}</summary>
+					<div class="ui segment tw-mt-2">
+						<form class="ui form" method="post" action="{{.RepoLink}}/licenses/packages">
+							{{.CsrfTokenHtml}}
+							<div class="two fields">
+								<div class="required field">
+									<label>{{ctx.Locale.Tr "repo.licenses.package_name"}}</label>
+									<input name="name" required placeholder="e.g. Pro Annual, Basic Monthly">
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.description"}}</label>
+									<input name="description" placeholder="e.g. Annual pro subscription with all channels">
+								</div>
+							</div>
+							<div class="three fields">
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.duration"}} ({{ctx.Locale.Tr "repo.licenses.days"}})</label>
+									<input name="duration_days" type="number" value="0" min="0">
+									<p class="help">0 = {{ctx.Locale.Tr "repo.licenses.lifetime"}}</p>
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.max_sites"}}</label>
+									<input name="max_sites" type="number" value="0" min="0">
+									<p class="help">0 = unlimited</p>
+								</div>
+								<div class="field">
+									<label>{{ctx.Locale.Tr "repo.licenses.channels"}}</label>
+									<input name="allowed_channels" placeholder="stable,release-candidate">
+									<p class="help">{{ctx.Locale.Tr "repo.licenses.channels_help"}}</p>
+								</div>
+							</div>
+							<button class="ui primary button" type="submit">{{ctx.Locale.Tr "repo.licenses.create_package"}}</button>
+						</form>
 					</div>
-					<div class="three fields">
-						<div class="field">
-							<label>{{ctx.Locale.Tr "repo.licenses.duration"}} ({{ctx.Locale.Tr "repo.licenses.days"}})</label>
-							<input name="duration_days" type="number" value="0" min="0">
-							<p class="help">0 = {{ctx.Locale.Tr "repo.licenses.lifetime"}}</p>
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "repo.licenses.max_sites"}}</label>
-							<input name="max_sites" type="number" value="0" min="0">
-							<p class="help">0 = unlimited</p>
-						</div>
-						<div class="field">
-							<label>{{ctx.Locale.Tr "repo.licenses.channels"}}</label>
-							<input name="allowed_channels" placeholder="stable,release-candidate">
-							<p class="help">{{ctx.Locale.Tr "repo.licenses.channels_help"}}</p>
-						</div>
-					</div>
-					<button class="ui primary button" type="submit">{{ctx.Locale.Tr "repo.licenses.create_package"}}</button>
-				</form>
+				</details>
 			</div>
 		{{end}}
 

templates/repo/licenses_edit_package.tmpl

@@ -0,0 +1,52 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository">
+	{{template "repo/header" .}}
+	<div class="ui container">
+		<h4 class="ui top attached header">
+			{{svg "octicon-pencil" 16}} {{ctx.Locale.Tr "repo.licenses.edit_package"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" method="post" action="{{.RepoLink}}/licenses/packages/{{.Package.ID}}/edit">
+				{{.CsrfTokenHtml}}
+				<div class="two fields">
+					<div class="required field">
+						<label>{{ctx.Locale.Tr "repo.licenses.package_name"}}</label>
+						<input name="name" required value="{{.Package.Name}}">
+					</div>
+					<div class="field">
+						<label>{{ctx.Locale.Tr "repo.licenses.description"}}</label>
+						<input name="description" value="{{.Package.Description}}">
+					</div>
+				</div>
+				<div class="three fields">
+					<div class="field">
+						<label>{{ctx.Locale.Tr "repo.licenses.duration"}} ({{ctx.Locale.Tr "repo.licenses.days"}})</label>
+						<input name="duration_days" type="number" value="{{.Package.DurationDays}}" min="0">
+						<p class="help">0 = {{ctx.Locale.Tr "repo.licenses.lifetime"}}</p>
+					</div>
+					<div class="field">
+						<label>{{ctx.Locale.Tr "repo.licenses.max_sites"}}</label>
+						<input name="max_sites" type="number" value="{{.Package.MaxSites}}" min="0">
+						<p class="help">0 = unlimited</p>
+					</div>
+					<div class="field">
+						<label>{{ctx.Locale.Tr "repo.licenses.channels"}}</label>
+						<input name="allowed_channels" value="{{.Package.AllowedChannels}}">
+						<p class="help">{{ctx.Locale.Tr "repo.licenses.channels_help"}}</p>
+					</div>
+				</div>
+				<div class="field">
+					<div class="ui checkbox">
+						<input name="is_active" type="checkbox" {{if .Package.IsActive}}checked{{end}}>
+						<label>{{ctx.Locale.Tr "repo.licenses.active"}}</label>
+					</div>
+				</div>
+				<div class="field tw-mt-4">
+					<button class="ui primary button" type="submit">{{ctx.Locale.Tr "save"}}</button>
+					<a class="ui button" href="{{.RepoLink}}/licenses">{{ctx.Locale.Tr "cancel"}}</a>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/repo/release_tag_header.tmpl

@@ -17,9 +17,16 @@
 			</a>
 		{{end}}
 		{{if not .PageIsTagList}}
-			<a class="ui small button" href="{{.RepoLink}}/updates.xml" target="_blank">
-				{{svg "octicon-download" 16}} {{ctx.Locale.Tr "repo.release.update_feed"}}
-			</a>
+			{{if or (eq .RepoUpdatePlatform "joomla") (eq .RepoUpdatePlatform "both") (eq .RepoUpdatePlatform "")}}
+				<a class="ui small button" href="{{.RepoLink}}/updates.xml" target="_blank">
+					{{svg "octicon-download" 16}} Joomla XML
+				</a>
+			{{end}}
+			{{if or (eq .RepoUpdatePlatform "dolibarr") (eq .RepoUpdatePlatform "both")}}
+				<a class="ui small button" href="{{.RepoLink}}/updates/dolibarr.json" target="_blank">
+					{{svg "octicon-download" 16}} Dolibarr JSON
+				</a>
+			{{end}}
 		{{end}}
 		{{if and (not .PageIsTagList) .CanCreateRelease}}
 			<a class="ui small primary button" href="{{$.RepoLink}}/releases/new{{if .PageIsSingleTag}}?tag={{.SingleReleaseTagName}}{{end}}">

templates/repo/settings/options.tmpl

@@ -514,6 +514,20 @@
 						</select>
 						<p class="help">{{ctx.Locale.Tr "repo.settings.unit_visibility_releases_help"}}</p>
 					</div>
+					<div class="inline field">
+						<label>{{ctx.Locale.Tr "repo.settings.update_platform"}}</label>
+						<select name="update_platform" class="ui dropdown">
+							<option value="joomla" {{if or (not .RepoUpdateConfig) (eq .RepoUpdateConfig.Platform "joomla") (eq .RepoUpdateConfig.Platform "")}}selected{{end}}>Joomla (updates.xml)</option>
+							<option value="dolibarr" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.Platform "dolibarr")}}selected{{end}}>Dolibarr (JSON)</option>
+							<option value="both" {{if and .RepoUpdateConfig (eq .RepoUpdateConfig.Platform "both")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.update_platform_both"}}</option>
+						</select>
+					</div>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="require_update_key" type="checkbox" {{if and .RepoUpdateConfig .RepoUpdateConfig.RequireKey}}checked{{end}}>
+							<label>{{ctx.Locale.Tr "repo.settings.require_update_key"}}</label>
+						</div>
+					</div>
 				</div>
 
 				{{$isPackagesEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypePackages}}