Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaswinkler committed Mar 18, 2021
2 parents b6428aa + ce2bae1 commit b7e570a
Show file tree
Hide file tree
Showing 46 changed files with 545 additions and 472 deletions.
15 changes: 15 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
Changelog
*********

paperless-ng 1.3.2
##################

* Added translation into Portuguese.

* Changes

* The exporter now exports user accounts, mail accounts, mail rules and saved views as well.

* Fixes

* Minor layout issues with document cards and the log viewer.

* Fixed an issue with any/all/exact matching when characters used in regular expressions were used for the match.

paperless-ng 1.3.1
##################

Expand Down
1 change: 1 addition & 0 deletions src-ui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"fr-FR": "src/locale/messages.fr_FR.xlf",
"en-GB": "src/locale/messages.en_GB.xlf",
"pt-BR": "src/locale/messages.pt_BR.xlf",
"pt-PT": "src/locale/messages.pt_PT.xlf",
"it-IT": "src/locale/messages.it_IT.xlf",
"ro-RO": "src/locale/messages.ro_RO.xlf",
"ru-RU": "src/locale/messages.ru_RU.xlf",
Expand Down
28 changes: 14 additions & 14 deletions src-ui/messages.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1212,14 +1212,7 @@
<source>View</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">52</context>
</context-group>
</trans-unit>
<trans-unit id="849b42384616374df49bd8b3711ec159cb10b845" datatype="html">
<source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">71</context>
<context context-type="linenumber">51</context>
</context-group>
</trans-unit>
<trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
Expand Down Expand Up @@ -1689,46 +1682,53 @@
<context context-type="linenumber">94</context>
</context-group>
</trans-unit>
<trans-unit id="153799456510623899" datatype="html">
<source>Portuguese</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
</context-group>
</trans-unit>
<trans-unit id="9184513005098760425" datatype="html">
<source>Portuguese (Brazil)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
<context context-type="linenumber">96</context>
</context-group>
</trans-unit>
<trans-unit id="2935232983274991580" datatype="html">
<source>Italian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">96</context>
<context context-type="linenumber">97</context>
</context-group>
</trans-unit>
<trans-unit id="8118856427047826368" datatype="html">
<source>Romanian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">97</context>
<context context-type="linenumber">98</context>
</context-group>
</trans-unit>
<trans-unit id="7137419789978325708" datatype="html">
<source>Russian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">98</context>
<context context-type="linenumber">99</context>
</context-group>
</trans-unit>
<trans-unit id="5190825892106392539" datatype="html">
<source>Spanish</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">100</context>
</context-group>
</trans-unit>
<trans-unit id="4912706592792948707" datatype="html">
<source>ISO 8601</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">105</context>
<context context-type="linenumber">106</context>
</context-group>
</trans-unit>
<trans-unit id="2119857572761283468" datatype="html">
Expand Down
1 change: 1 addition & 0 deletions src-ui/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ registerLocaleData(localeFr)
registerLocaleData(localeNl)
registerLocaleData(localeDe)
registerLocaleData(localePt, "pt-BR")
registerLocaleData(localePt, "pt-PT")
registerLocaleData(localeIt)
registerLocaleData(localeEnGb)
registerLocaleData(localeRo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
}

.metadata-icon {
width: 0.8rem;
height: 0.8rem;
width: 0.9rem;
height: 0.9rem;
padding: 0.05rem;
}

.search-score {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@
}

.metadata-icon {
width: 0.8rem;
height: 0.8rem;
width: 0.9rem;
height: 0.9rem;
padding: 0.05rem;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src-ui/src/app/components/manage/logs/logs.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<div [ngbNavOutlet]="nav" class="mt-2"></div>

<div class="bg-dark p-3 mb-3 text-light text-monospace log-container">
<div class="bg-dark p-3 text-light text-monospace log-container" #logContainer>
<p
class="m-0 p-0 log-entry-{{getLogLevel(log)}}"
*ngFor="let log of logs">{{log}}</p>
Expand Down
2 changes: 1 addition & 1 deletion src-ui/src/app/components/manage/logs/logs.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

.log-container {
overflow-y: scroll;
height: calc(100vh - 190px);
height: calc(100vh - 200px);
top: 70px;

p {
Expand Down
18 changes: 16 additions & 2 deletions src-ui/src/app/components/manage/logs/logs.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { Component, ElementRef, OnInit, AfterViewChecked, ViewChild } from '@angular/core';
import { LogService } from 'src/app/services/rest/log.service';

@Component({
selector: 'app-logs',
templateUrl: './logs.component.html',
styleUrls: ['./logs.component.scss']
})
export class LogsComponent implements OnInit {
export class LogsComponent implements OnInit, AfterViewChecked {

constructor(private logService: LogService) { }

Expand All @@ -16,6 +16,8 @@ export class LogsComponent implements OnInit {

activeLog: string

@ViewChild('logContainer') logContainer: ElementRef

ngOnInit(): void {
this.logService.list().subscribe(result => {
this.logFiles = result
Expand All @@ -26,6 +28,10 @@ export class LogsComponent implements OnInit {
})
}

ngAfterViewChecked() {
this.scrollToBottom();
}

reloadLogs() {
this.logService.get(this.activeLog).subscribe(result => {
this.logs = result
Expand All @@ -48,4 +54,12 @@ export class LogsComponent implements OnInit {
}
}

scrollToBottom(): void {
this.logContainer?.nativeElement.scroll({
top: this.logContainer.nativeElement.scrollHeight,
left: 0,
behavior: 'auto'
});
}

}
1 change: 1 addition & 0 deletions src-ui/src/app/services/settings.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export class SettingsService {
{code: "de-de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
{code: "nl-nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
{code: "fr-fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
{code: "pt-pt", name: $localize`Portuguese`, englishName: "Portuguese", dateInputFormat: "dd/mm/yyyy"},
{code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"},
{code: "it-it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"},
{code: "ro-ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"},
Expand Down
2 changes: 1 addition & 1 deletion src-ui/src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const environment = {
apiBaseUrl: "/api/",
apiVersion: "2",
appTitle: "Paperless-ng",
version: "1.3.1",
version: "1.3.2",
webSocketHost: window.location.host,
webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:")
};
30 changes: 15 additions & 15 deletions src-ui/src/locale/messages.cs_CZ.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1384,18 +1384,10 @@
<source>View</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">52</context>
<context context-type="linenumber">51</context>
</context-group>
<target state="needs-translation">View</target>
</trans-unit>
<trans-unit id="849b42384616374df49bd8b3711ec159cb10b845" datatype="html">
<source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">71</context>
</context-group>
<target state="needs-translation">Created: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></target>
</trans-unit>
<trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
<source>Filter by correspondent</source>
<context-group purpose="location">
Expand Down Expand Up @@ -1929,51 +1921,59 @@
</context-group>
<target state="translated">Francouzština</target>
</trans-unit>
<trans-unit id="153799456510623899" datatype="html">
<source>Portuguese</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
</context-group>
<target state="needs-translation">Portuguese</target>
</trans-unit>
<trans-unit id="9184513005098760425" datatype="html">
<source>Portuguese (Brazil)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
<context context-type="linenumber">96</context>
</context-group>
<target state="needs-translation">Portuguese (Brazil)</target>
</trans-unit>
<trans-unit id="2935232983274991580" datatype="html">
<source>Italian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">96</context>
<context context-type="linenumber">97</context>
</context-group>
<target state="needs-translation">Italian</target>
</trans-unit>
<trans-unit id="8118856427047826368" datatype="html">
<source>Romanian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">97</context>
<context context-type="linenumber">98</context>
</context-group>
<target state="needs-translation">Romanian</target>
</trans-unit>
<trans-unit id="7137419789978325708" datatype="html">
<source>Russian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">98</context>
<context context-type="linenumber">99</context>
</context-group>
<target state="needs-translation">Russian</target>
</trans-unit>
<trans-unit id="5190825892106392539" datatype="html">
<source>Spanish</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">100</context>
</context-group>
<target state="needs-translation">Spanish</target>
</trans-unit>
<trans-unit id="4912706592792948707" datatype="html">
<source>ISO 8601</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">105</context>
<context context-type="linenumber">106</context>
</context-group>
<target state="needs-translation">ISO 8601</target>
</trans-unit>
Expand Down
30 changes: 15 additions & 15 deletions src-ui/src/locale/messages.de_DE.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1384,18 +1384,10 @@
<source>View</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">52</context>
<context context-type="linenumber">51</context>
</context-group>
<target state="translated">Anzeigen</target>
</trans-unit>
<trans-unit id="849b42384616374df49bd8b3711ec159cb10b845" datatype="html">
<source>Created: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
<context context-type="linenumber">71</context>
</context-group>
<target state="translated">Erstellt: <x id="INTERPOLATION" equiv-text="{{document.created | customDate}}"/></target>
</trans-unit>
<trans-unit id="cd6f3fd48957e1fea6545c2b2defc7b2435ebfa8" datatype="html">
<source>Filter by correspondent</source>
<context-group purpose="location">
Expand Down Expand Up @@ -1929,51 +1921,59 @@
</context-group>
<target state="translated">Französisch</target>
</trans-unit>
<trans-unit id="153799456510623899" datatype="html">
<source>Portuguese</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
</context-group>
<target state="translated">Portugiesisch</target>
</trans-unit>
<trans-unit id="9184513005098760425" datatype="html">
<source>Portuguese (Brazil)</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">95</context>
<context context-type="linenumber">96</context>
</context-group>
<target state="translated">Portugiesisch (Brasilien)</target>
</trans-unit>
<trans-unit id="2935232983274991580" datatype="html">
<source>Italian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">96</context>
<context context-type="linenumber">97</context>
</context-group>
<target state="translated">Italienisch</target>
</trans-unit>
<trans-unit id="8118856427047826368" datatype="html">
<source>Romanian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">97</context>
<context context-type="linenumber">98</context>
</context-group>
<target state="translated">Rumänisch</target>
</trans-unit>
<trans-unit id="7137419789978325708" datatype="html">
<source>Russian</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">98</context>
<context context-type="linenumber">99</context>
</context-group>
<target state="translated">Russisch</target>
</trans-unit>
<trans-unit id="5190825892106392539" datatype="html">
<source>Spanish</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">100</context>
</context-group>
<target state="translated">Spanisch</target>
</trans-unit>
<trans-unit id="4912706592792948707" datatype="html">
<source>ISO 8601</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/services/settings.service.ts</context>
<context context-type="linenumber">105</context>
<context context-type="linenumber">106</context>
</context-group>
<target state="translated">ISO 8601</target>
</trans-unit>
Expand Down
Loading

0 comments on commit b7e570a

Please sign in to comment.