mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-07-09 03:04:19 -04:00
Release Testing Bugs (#1790)
* Stop showing loading indicator when no next/prev chapter * Fixed a bug where manage collections wasn't named correctly in UI. * Slight tweaks on email flow
This commit is contained in:
parent
e50f5ece1e
commit
00f153d8ea
@ -869,17 +869,25 @@ public class AccountController : BaseApiController
|
|||||||
_logger.LogCritical("[Email Migration]: Token {UserName}: {Token}", user.UserName, token);
|
_logger.LogCritical("[Email Migration]: Token {UserName}: {Token}", user.UserName, token);
|
||||||
if (await _accountService.CheckIfAccessible(Request))
|
if (await _accountService.CheckIfAccessible(Request))
|
||||||
{
|
{
|
||||||
await _emailService.SendMigrationEmail(new EmailMigrationDto()
|
try
|
||||||
{
|
{
|
||||||
EmailAddress = user.Email,
|
await _emailService.SendMigrationEmail(new EmailMigrationDto()
|
||||||
Username = user.UserName,
|
{
|
||||||
ServerConfirmationLink = emailLink,
|
EmailAddress = user.Email,
|
||||||
InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
|
Username = user.UserName,
|
||||||
});
|
ServerConfirmationLink = emailLink,
|
||||||
|
InstallId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "There was an issue resending invite email");
|
||||||
|
return BadRequest("There was an issue resending invite email");
|
||||||
|
}
|
||||||
return Ok(emailLink);
|
return Ok(emailLink);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Ok("The server is not accessible externally. Please ");
|
return Ok("The server is not accessible externally");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -15,5 +15,5 @@ export interface Library {
|
|||||||
includeInDashboard: boolean;
|
includeInDashboard: boolean;
|
||||||
includeInRecommended: boolean;
|
includeInRecommended: boolean;
|
||||||
includeInSearch: boolean;
|
includeInSearch: boolean;
|
||||||
manageCollections: boolean;
|
createCollections: boolean;
|
||||||
}
|
}
|
@ -245,7 +245,14 @@ export class ReaderSettingsComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily);
|
this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily);
|
||||||
this.cdRef.markForCheck();
|
this.settingsForm.get('bookReaderFontSize')?.setValue(this.user.preferences.bookReaderFontSize);
|
||||||
|
this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.user.preferences.bookReaderLineSpacing);
|
||||||
|
this.settingsForm.get('bookReaderMargin')?.setValue(this.user.preferences.bookReaderMargin);
|
||||||
|
this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.user.preferences.bookReaderReadingDirection);
|
||||||
|
this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.user.preferences.bookReaderTapToPaginate);
|
||||||
|
this.settingsForm.get('layoutMode')?.setValue(this.user.preferences.layoutMode);
|
||||||
|
this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.user.preferences.bookReaderImmersiveMode);
|
||||||
|
this.cdRef.detectChanges();
|
||||||
this.styleUpdate.emit(this.pageStyles);
|
this.styleUpdate.emit(this.pageStyles);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1173,6 +1173,8 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
loadNextChapter() {
|
loadNextChapter() {
|
||||||
if (this.nextPageDisabled || this.nextChapterDisabled || this.bookmarkMode) {
|
if (this.nextPageDisabled || this.nextChapterDisabled || this.bookmarkMode) {
|
||||||
this.toastr.info('No Next Chapter');
|
this.toastr.info('No Next Chapter');
|
||||||
|
this.isLoading = false;
|
||||||
|
this.cdRef.markForCheck();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1189,6 +1191,8 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
loadPrevChapter() {
|
loadPrevChapter() {
|
||||||
if (this.prevPageDisabled || this.prevChapterDisabled || this.bookmarkMode) {
|
if (this.prevPageDisabled || this.prevChapterDisabled || this.bookmarkMode) {
|
||||||
this.toastr.info('No Previous Chapter');
|
this.toastr.info('No Previous Chapter');
|
||||||
|
this.isLoading = false;
|
||||||
|
this.cdRef.markForCheck();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.continuousChaptersStack.pop();
|
this.continuousChaptersStack.pop();
|
||||||
|
@ -96,7 +96,7 @@
|
|||||||
<div class="col-md-12 col-sm-12 pe-2 mb-2">
|
<div class="col-md-12 col-sm-12 pe-2 mb-2">
|
||||||
<div class="mb-3 mt-1">
|
<div class="mb-3 mt-1">
|
||||||
<div class="form-check form-switch">
|
<div class="form-check form-switch">
|
||||||
<input type="checkbox" id="manage-collections" role="switch" formControlName="manageCollections" class="form-check-input" aria-labelledby="auto-close-label">
|
<input type="checkbox" id="manage-collections" role="switch" formControlName="createCollections" class="form-check-input" aria-labelledby="auto-close-label">
|
||||||
<label class="form-check-label" for="manage-collections">Manage Collections</label>
|
<label class="form-check-label" for="manage-collections">Manage Collections</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -118,7 +118,7 @@ export class LibrarySettingsModalComponent implements OnInit, OnDestroy {
|
|||||||
this.libraryForm.get('includeInDashboard')?.setValue(this.library.includeInDashboard);
|
this.libraryForm.get('includeInDashboard')?.setValue(this.library.includeInDashboard);
|
||||||
this.libraryForm.get('includeInRecommended')?.setValue(this.library.includeInRecommended);
|
this.libraryForm.get('includeInRecommended')?.setValue(this.library.includeInRecommended);
|
||||||
this.libraryForm.get('includeInSearch')?.setValue(this.library.includeInSearch);
|
this.libraryForm.get('includeInSearch')?.setValue(this.library.includeInSearch);
|
||||||
this.libraryForm.get('manageCollections')?.setValue(this.library.manageCollections);
|
this.libraryForm.get('createCollections')?.setValue(this.library.createCollections);
|
||||||
this.selectedFolders = this.library.folders;
|
this.selectedFolders = this.library.folders;
|
||||||
this.madeChanges = false;
|
this.madeChanges = false;
|
||||||
this.cdRef.markForCheck();
|
this.cdRef.markForCheck();
|
||||||
|
37
openapi.json
37
openapi.json
@ -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.6.1.38"
|
"version": "0.6.1.41"
|
||||||
},
|
},
|
||||||
"servers": [
|
"servers": [
|
||||||
{
|
{
|
||||||
@ -7443,6 +7443,36 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/api/Settings/reset-ip-addresses": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Settings"
|
||||||
|
],
|
||||||
|
"summary": "Resets the IP Addresses",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Success",
|
||||||
|
"content": {
|
||||||
|
"text/plain": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ServerSettingDto"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ServerSettingDto"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"text/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ServerSettingDto"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/api/Settings/reset-email-url": {
|
"/api/Settings/reset-email-url": {
|
||||||
"post": {
|
"post": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@ -13582,6 +13612,11 @@
|
|||||||
"description": "Port the server listens on. Managed in appsettings.json.",
|
"description": "Port the server listens on. Managed in appsettings.json.",
|
||||||
"format": "int32"
|
"format": "int32"
|
||||||
},
|
},
|
||||||
|
"ipAddresses": {
|
||||||
|
"type": "string",
|
||||||
|
"description": "Comma separated list of ip addresses the server listens on. Managed in appsettings.json",
|
||||||
|
"nullable": true
|
||||||
|
},
|
||||||
"allowStatCollection": {
|
"allowStatCollection": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Allows anonymous information to be collected and sent to KavitaStats"
|
"description": "Allows anonymous information to be collected and sent to KavitaStats"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user