Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Hosted Weblate 2023-08-10 15:59:41 +02:00
commit a95adacf27
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
API/Controllers/AccountController.cs
View File

@ -1018,7 +1018,20 @@ public class AccountController : BaseApiController
if (!string.IsNullOrEmpty(serverSettings.HostName)) origin = serverSettings.HostName; if (!string.IsNullOrEmpty(serverSettings.HostName)) origin = serverSettings.HostName;
var baseUrl = string.Empty; var baseUrl = string.Empty;
if (!string.IsNullOrEmpty(serverSettings.BaseUrl) && !serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl)) baseUrl = serverSettings.BaseUrl + "/"; if (!string.IsNullOrEmpty(serverSettings.BaseUrl) &&
!serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl))
{
baseUrl = serverSettings.BaseUrl + "/";
if (baseUrl.EndsWith("//"))
{
baseUrl = baseUrl.Replace("//", "/");
}
if (baseUrl.StartsWith("/"))
{
baseUrl = baseUrl.Substring(1, baseUrl.Length - 1);
}
}
return Ok(origin + "/" + baseUrl + "api/opds/" + user!.ApiKey); return Ok(origin + "/" + baseUrl + "api/opds/" + user!.ApiKey);
} }

7
API/config/appsettings.Development.json
View File

@ -2,6 +2,7 @@
"TokenKey": "super secret unguessable key that is longer because we require it", "TokenKey": "super secret unguessable key that is longer because we require it",
"Port": 5000, "Port": 5000,
"IpAddresses": "", "IpAddresses": "",
"BaseUrl": "/", "BaseUrl": "/test/",
"Cache": 90 "Cache": 90,
} "XFrameOrigins": "SAMEORIGIN"
}

2
Kavita.Common/Kavita.Common.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Company>kavitareader.com</Company> <Company>kavitareader.com</Company>
<Product>Kavita</Product> <Product>Kavita</Product>
<AssemblyVersion>0.7.6.15</AssemblyVersion> <AssemblyVersion>0.7.6.16</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<TieredPGO>true</TieredPGO> <TieredPGO>true</TieredPGO>
</PropertyGroup> </PropertyGroup>

4
UI/Web/src/app/admin/invite-user/invite-user.component.html
View File

@ -5,9 +5,7 @@
<button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="close()"></button> <button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="close()"></button>
</div> </div>
<div class="modal-body scrollable-modal"> <div class="modal-body scrollable-modal">
<p> <p [innerHTML]="t('description') | safeHtml"></p>
{{t('description')}}
</p>
<form [formGroup]="inviteForm" *ngIf="emailLink === ''"> <form [formGroup]="inviteForm" *ngIf="emailLink === ''">
<div class="row g-0"> <div class="row g-0">

3
UI/Web/src/app/admin/invite-user/invite-user.component.ts
View File

@ -13,13 +13,14 @@ import { LibrarySelectorComponent } from '../library-selector/library-selector.c
import { RoleSelectorComponent } from '../role-selector/role-selector.component'; import { RoleSelectorComponent } from '../role-selector/role-selector.component';
import { NgIf } from '@angular/common'; import { NgIf } from '@angular/common';
import {translate, TranslocoDirective} from "@ngneat/transloco"; import {translate, TranslocoDirective} from "@ngneat/transloco";
import {SafeHtmlPipe} from "../../pipe/safe-html.pipe";
@Component({ @Component({
selector: 'app-invite-user', selector: 'app-invite-user',
templateUrl: './invite-user.component.html', templateUrl: './invite-user.component.html',
styleUrls: ['./invite-user.component.scss'], styleUrls: ['./invite-user.component.scss'],
standalone: true, standalone: true,
imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective] imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective, SafeHtmlPipe]
}) })
export class InviteUserComponent implements OnInit { export class InviteUserComponent implements OnInit {

2
UI/Web/src/app/admin/manage-library/manage-library.component.ts
View File

@ -118,7 +118,7 @@ export class ManageLibraryComponent implements OnInit {
} }
async deleteLibrary(library: Library) { async deleteLibrary(library: Library) {
if (await this.confirmService.confirm(translate('toast.confirm-library-delete', {name: library.name}))) { if (await this.confirmService.confirm(translate('toasts.confirm-library-delete', {name: library.name}))) {
this.deletionInProgress = true; this.deletionInProgress = true;
this.libraryService.delete(library.id).pipe(take(1)).subscribe(() => { this.libraryService.delete(library.id).pipe(take(1)).subscribe(() => {
this.deletionInProgress = false; this.deletionInProgress = false;

2
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0", "name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
}, },
"version": "0.7.6.14" "version": "0.7.6.15"
}, },
"servers": [ "servers": [
{ {