From c502d4055d52eb0d1b0908a5e8a5e5d14e403c39 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 00:33:29 +0100
Subject: [PATCH 01/12] fixes #11 and some server side warnings

---
 .../document-detail/document-detail.component.ts     |  6 +++---
 src/documents/views.py                               | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 308e499a4..dcbaaa1a8 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -59,9 +59,9 @@ export class DocumentDetailComponent implements OnInit {
     private documentListViewService: DocumentListViewService) { }
 
   ngOnInit(): void {
-    this.correspondentService.list().subscribe(result => this.correspondents = result.results)
-    this.documentTypeService.list().subscribe(result => this.documentTypes = result.results)
-    this.tagService.list().subscribe(result => this.tags = result.results)
+    this.correspondentService.list(1,100000).subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.list(1,100000).subscribe(result => this.documentTypes = result.results)
+    this.tagService.list(1,100000).subscribe(result => this.tags = result.results)
 
     this.route.paramMap.subscribe(paramMap => {
       this.documentId = +paramMap.get('id')
diff --git a/src/documents/views.py b/src/documents/views.py
index f8050a459..2740d1b68 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -52,35 +52,35 @@ class IndexView(TemplateView):
 
 class CorrespondentViewSet(ModelViewSet):
     model = Correspondent
-    queryset = Correspondent.objects.annotate(document_count=Count('documents'), last_correspondence=Max('documents__created'))
+    queryset = Correspondent.objects.annotate(document_count=Count('documents'), last_correspondence=Max('documents__created')).order_by('name')
     serializer_class = CorrespondentSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)
     filter_backends = (DjangoFilterBackend, OrderingFilter)
     filter_class = CorrespondentFilterSet
-    ordering_fields = ("name", "document_count", "last_correspondence")
+    ordering_fields = ("name", "matching_algorithm", "match", "document_count", "last_correspondence")
 
 
 class TagViewSet(ModelViewSet):
     model = Tag
-    queryset = Tag.objects.annotate(document_count=Count('documents'))
+    queryset = Tag.objects.annotate(document_count=Count('documents')).order_by('name')
     serializer_class = TagSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)
     filter_backends = (DjangoFilterBackend, OrderingFilter)
     filter_class = TagFilterSet
-    ordering_fields = ("name", "document_count")
+    ordering_fields = ("name", "matching_algorithm", "match", "document_count")
 
 
 class DocumentTypeViewSet(ModelViewSet):
     model = DocumentType
-    queryset = DocumentType.objects.annotate(document_count=Count('documents'))
+    queryset = DocumentType.objects.annotate(document_count=Count('documents')).order_by('name')
     serializer_class = DocumentTypeSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)
     filter_backends = (DjangoFilterBackend, OrderingFilter)
     filter_class = DocumentTypeFilterSet
-    ordering_fields = ("name", "document_count")
+    ordering_fields = ("name", "matching_algorithm", "match", "document_count")
 
 
 class DocumentViewSet(RetrieveModelMixin,

From a2fd1afa80c93cde455fadf596eff2879dcfe8df Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 01:00:21 +0100
Subject: [PATCH 02/12] disabled fuzzy matching since it screwed up scored
 results (?)

---
 src/documents/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index 2740d1b68..ce850f480 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -186,8 +186,7 @@ class SearchView(APIView):
                 page = 1
 
             with self.ix.searcher() as searcher:
-                query_parser = QueryParser("content", self.ix.schema,
-                                    termclass=terms.FuzzyTerm).parse(query)
+                query_parser = QueryParser("content", self.ix.schema).parse(query)
                 result_page = searcher.search_page(query_parser, page)
                 result_page.results.fragmenter = highlight.ContextFragmenter(
                     surround=50)

From 7b561af7a14eace9f12a3a59588912227fa4fd5c Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 01:42:23 +0100
Subject: [PATCH 03/12] documents now remain open fixes #16

---
 .../app-frame/app-frame.component.ts          |  2 +-
 src-ui/src/app/data/storage-keys.ts           |  3 ++
 .../app/services/open-documents.service.ts    | 28 +++++++++++++++----
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src-ui/src/app/data/storage-keys.ts

diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 595da5b1d..fcd05f2fc 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -69,7 +69,7 @@ export class AppFrameComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.openDocumentsSubscription = this.openDocumentsService.getOpenDocuments().subscribe(docs => this.openDocuments = docs)
+    this.openDocuments = this.openDocumentsService.getOpenDocuments()
   }
 
   ngOnDestroy() {
diff --git a/src-ui/src/app/data/storage-keys.ts b/src-ui/src/app/data/storage-keys.ts
new file mode 100644
index 000000000..aa39b31d1
--- /dev/null
+++ b/src-ui/src/app/data/storage-keys.ts
@@ -0,0 +1,3 @@
+export const OPEN_DOCUMENT_SERVICE = {
+  DOCUMENTS: 'open-documents-service:openDocuments'
+}
\ No newline at end of file
diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts
index bcf4166f9..009652103 100644
--- a/src-ui/src/app/services/open-documents.service.ts
+++ b/src-ui/src/app/services/open-documents.service.ts
@@ -1,26 +1,38 @@
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { PaperlessDocument } from '../data/paperless-document';
+import { OPEN_DOCUMENT_SERVICE } from '../data/storage-keys';
 
 @Injectable({
   providedIn: 'root'
 })
 export class OpenDocumentsService {
 
-  constructor() { }
+  constructor() { 
+    if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) {
+      try {
+        this.openDocuments = JSON.parse(sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS))
+      } catch (e) {
+        sessionStorage.removeItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)
+        this.openDocuments = []
+      }
+    }
+  }
 
   private openDocuments: PaperlessDocument[] = []
 
-  private openDocumentsSubject: Subject<PaperlessDocument[]> = new Subject()
+  getOpenDocuments(): PaperlessDocument[] {
+    return this.openDocuments
+  }
 
-  getOpenDocuments(): Observable<PaperlessDocument[]> {
-    return this.openDocumentsSubject
+  getOpenDocument(id: number): PaperlessDocument {
+    return this.openDocuments.find(d => d.id == id)
   }
 
   openDocument(doc: PaperlessDocument) {
     if (this.openDocuments.find(d => d.id == doc.id) == null) {
       this.openDocuments.push(doc)
-      this.openDocumentsSubject.next(this.openDocuments)
+      this.save()
     }
   }
 
@@ -28,8 +40,12 @@ export class OpenDocumentsService {
     let index = this.openDocuments.findIndex(d => d.id == doc.id)
     if (index > -1) {
       this.openDocuments.splice(index, 1)
-      this.openDocumentsSubject.next(this.openDocuments)
+      this.save()
     }
   }
 
+  save() {
+    sessionStorage.setItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS, JSON.stringify(this.openDocuments))
+  }
+
 }

From 14f42b8b7a98e54e67204a51042d9d724dc13f03 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 13:10:23 +0100
Subject: [PATCH 04/12] fixed date editing, fixes #10

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../input/date-time/date-time.component.css   |  0
 .../input/date-time/date-time.component.html  | 14 +++++
 .../date-time/date-time.component.spec.ts     | 25 ++++++++
 .../input/date-time/date-time.component.ts    | 62 +++++++++++++++++++
 .../document-detail.component.html            | 11 +---
 .../document-detail.component.ts              | 49 +++++++--------
 7 files changed, 127 insertions(+), 38 deletions(-)
 create mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.css
 create mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.html
 create mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts
 create mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index dce6a9225..3c1b37474 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -38,6 +38,7 @@ import { SelectComponent } from './components/common/input/select/select.compone
 import { CheckComponent } from './components/common/input/check/check.component';
 import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+import { DateTimeComponent } from './components/common/input/date-time/date-time.component';
 
 @NgModule({
   declarations: [
@@ -69,7 +70,8 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
     TextComponent,
     SelectComponent,
     CheckComponent,
-    SaveViewConfigDialogComponent
+    SaveViewConfigDialogComponent,
+    DateTimeComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.css b/src-ui/src/app/components/common/input/date-time/date-time.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html
new file mode 100644
index 000000000..eaed0e185
--- /dev/null
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.html
@@ -0,0 +1,14 @@
+<div class="form-row">
+  <div class="form-group col">
+      <label for="created_date">{{titleDate}}</label>
+      <input type="date" class="form-control" id="created_date" [(ngModel)]="dateValue" (change)="dateOrTimeChanged()">
+  </div>
+  <div class="form-group col">
+      <label for="created_time">{{titleTime}}</label>
+      <input type="time" class="form-control" id="created_time" [(ngModel)]="timeValue" (change)="dateOrTimeChanged()">
+  </div>
+
+</div>
+
+
+<!-- <small *ngIf="hint" class="form-text text-muted">{{hint}}</small> -->
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts
new file mode 100644
index 000000000..0657768bd
--- /dev/null
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DateTimeComponent } from './date-time.component';
+
+describe('DateTimeComponent', () => {
+  let component: DateTimeComponent;
+  let fixture: ComponentFixture<DateTimeComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ DateTimeComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DateTimeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
new file mode 100644
index 000000000..f8b66133a
--- /dev/null
+++ b/src-ui/src/app/components/common/input/date-time/date-time.component.ts
@@ -0,0 +1,62 @@
+import { formatDate } from '@angular/common';
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { AbstractInputComponent } from '../abstract-input';
+
+@Component({
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => DateTimeComponent),
+    multi: true
+  }],
+  selector: 'app-input-date-time',
+  templateUrl: './date-time.component.html',
+  styleUrls: ['./date-time.component.css']
+})
+export class DateTimeComponent implements OnInit,ControlValueAccessor  {
+
+  constructor() {
+  }
+
+  onChange = (newValue: any) => {};
+  
+  onTouched = () => {};
+
+  writeValue(newValue: any): void {
+    this.dateValue = formatDate(newValue, 'yyyy-MM-dd', "en-US")
+    this.timeValue = formatDate(newValue, 'HH:mm:ss', 'en-US')
+  }
+  registerOnChange(fn: any): void {
+    this.onChange = fn;
+  }
+  registerOnTouched(fn: any): void {
+    this.onTouched = fn;
+  }
+  setDisabledState?(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  @Input()
+  titleDate: string = "Date"
+
+  @Input()
+  titleTime: string = "Time"
+
+  @Input()
+  disabled: boolean = false
+
+  @Input()
+  hint: string
+
+  timeValue
+
+  dateValue
+
+  ngOnInit(): void {
+  }
+
+  dateOrTimeChanged() {
+    this.onChange(formatDate(this.dateValue + "T" + this.timeValue,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC"))
+  }
+
+}
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index f6bb4cebb..23981aa47 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -32,16 +32,7 @@
                     formControlName='archive_serial_number'>
             </div>
             
-            <div class="form-row">
-                <div class="form-group col">
-                    <label for="created_date">Date created</label>
-                    <input type="date" class="form-control" id="created_date" formControlName='created_date'>
-                </div>
-                <div class="form-group col">
-                    <label for="created_time">Time created</label>
-                    <input type="time" class="form-control" id="created_time" formControlName='created_time'>
-                </div>
-            </div>
+            <app-input-date-time title="Date created" titleTime="Time created" formControlName="created"></app-input-date-time>
             
             <div class="form-group">
                 <label for="content">Content</label>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index dcbaaa1a8..fb6be56aa 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -38,8 +38,7 @@ export class DocumentDetailComponent implements OnInit {
   documentForm: FormGroup = new FormGroup({
     title: new FormControl(''),
     content: new FormControl(''),
-    created_date: new FormControl(),
-    created_time: new FormControl(),
+    created: new FormControl(),
     correspondent_id: new FormControl(),
     document_type_id: new FormControl(),
     archive_serial_number: new FormControl(),
@@ -59,6 +58,10 @@ export class DocumentDetailComponent implements OnInit {
     private documentListViewService: DocumentListViewService) { }
 
   ngOnInit(): void {
+    this.documentForm.valueChanges.subscribe(wow => {
+      Object.assign(this.document, this.documentForm.value)
+    })
+
     this.correspondentService.list(1,100000).subscribe(result => this.correspondents = result.results)
     this.documentTypeService.list(1,100000).subscribe(result => this.documentTypes = result.results)
     this.tagService.list(1,100000).subscribe(result => this.tags = result.results)
@@ -67,18 +70,24 @@ export class DocumentDetailComponent implements OnInit {
       this.documentId = +paramMap.get('id')
       this.previewUrl = this.documentsService.getPreviewUrl(this.documentId)
       this.downloadUrl = this.documentsService.getDownloadUrl(this.documentId)
-      this.documentsService.get(this.documentId).subscribe(doc => {
-        this.openDocumentService.openDocument(doc)
-        this.document = doc
-        this.title = doc.title
-        this.documentForm.patchValue(doc)
-        this.documentForm.get('created_date').patchValue(this.datePipe.transform(doc.created, 'yyyy-MM-dd'))
-        this.documentForm.get('created_time').patchValue(this.datePipe.transform(doc.created, 'HH:mm:ss'))
-      }, error => {this.router.navigate(['404'])})
+      if (this.openDocumentService.getOpenDocument(this.documentId)) {
+        this.updateComponent(this.openDocumentService.getOpenDocument(this.documentId))
+      } else {
+        this.documentsService.get(this.documentId).subscribe(doc => {
+          this.openDocumentService.openDocument(doc)
+          this.updateComponent(doc)
+        }, error => {this.router.navigate(['404'])})
+      }
     })
 
   }
 
+  updateComponent(doc: PaperlessDocument) {
+    this.document = doc
+    this.title = doc.title
+    this.documentForm.patchValue(doc)
+  }
+
   createTag() {
     var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
@@ -133,29 +142,15 @@ export class DocumentDetailComponent implements OnInit {
     }
   }
 
-  getDateCreated() {
-    let newDate = this.documentForm.value.created_date
-    let newTime = this.documentForm.value.created_time
-    return formatDate(newDate + "T" + newTime,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC")
-    
-  }
 
-  save() {
-    let newDocument = Object.assign(Object.assign({}, this.document), this.documentForm.value)
-
-    newDocument.created = this.getDateCreated()
-    
-    this.documentsService.update(newDocument).subscribe(result => {
+  save() {    
+    this.documentsService.update(this.document).subscribe(result => {
       this.close()
     })
   }
 
   saveEditNext() {
-    let newDocument = Object.assign(Object.assign({}, this.document), this.documentForm.value)
-
-    newDocument.created = this.getDateCreated()
-
-    this.documentsService.update(newDocument).subscribe(result => {
+    this.documentsService.update(this.document).subscribe(result => {
       this.documentListViewService.getNext(this.document.id).subscribe(nextDocId => {
         if (nextDocId) {
           this.openDocumentService.closeDocument(this.document)

From c330a72188d4440eb6d7f14d56f51c9ea93c2eb9 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 17:23:36 +0100
Subject: [PATCH 05/12] a new tag editor fixes #20 also: discard document
 changes button

---
 src-ui/src/app/app.module.ts                  |  4 +-
 .../common/input/tags/tags.component.css      | 10 ++
 .../common/input/tags/tags.component.html     | 30 ++++++
 .../common/input/tags/tags.component.spec.ts  | 25 +++++
 .../common/input/tags/tags.component.ts       | 96 +++++++++++++++++++
 .../document-detail.component.html            | 27 +-----
 .../document-detail.component.ts              | 40 ++------
 .../rest/abstract-paperless-service.ts        |  4 +
 8 files changed, 179 insertions(+), 57 deletions(-)
 create mode 100644 src-ui/src/app/components/common/input/tags/tags.component.css
 create mode 100644 src-ui/src/app/components/common/input/tags/tags.component.html
 create mode 100644 src-ui/src/app/components/common/input/tags/tags.component.spec.ts
 create mode 100644 src-ui/src/app/components/common/input/tags/tags.component.ts

diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 3c1b37474..e10bdbd0c 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -39,6 +39,7 @@ import { CheckComponent } from './components/common/input/check/check.component'
 import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { DateTimeComponent } from './components/common/input/date-time/date-time.component';
+import { TagsComponent } from './components/common/input/tags/tags.component';
 
 @NgModule({
   declarations: [
@@ -71,7 +72,8 @@ import { DateTimeComponent } from './components/common/input/date-time/date-time
     SelectComponent,
     CheckComponent,
     SaveViewConfigDialogComponent,
-    DateTimeComponent
+    DateTimeComponent,
+    TagsComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.css b/src-ui/src/app/components/common/input/tags/tags.component.css
new file mode 100644
index 000000000..f2635b7f2
--- /dev/null
+++ b/src-ui/src/app/components/common/input/tags/tags.component.css
@@ -0,0 +1,10 @@
+.tags-form-control {
+  height: auto;
+}
+
+
+.scrollable-menu {
+  height: auto;
+  max-height: 300px;
+  overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
new file mode 100644
index 000000000..b2ad0944f
--- /dev/null
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -0,0 +1,30 @@
+<div class="form-group">
+  <label for="exampleFormControlTextarea1">Tags</label>
+
+  <div class="input-group">
+    <div class="form-control tags-form-control" id="tags">
+      <app-tag class="mr-2" *ngFor="let id of displayValue" [tag]="getTag(id)" (click)="removeTag(id)"></app-tag>
+    </div>
+
+    <div class="input-group-append" ngbDropdown placement="top-right">
+      <button class="btn btn-outline-secondary" type="button" ngbDropdownToggle></button>
+      <div ngbDropdownMenu class="scrollable-menu">
+        <button type="button" *ngFor="let tag of tags" ngbDropdownItem (click)="addTag(tag.id)">
+          <app-tag [tag]="tag"></app-tag>
+        </button>
+      </div>
+    </div>
+
+    <div class="input-group-append">
+
+      <button class="btn btn-outline-secondary" type="button" (click)="createTag()">
+        <svg class="buttonicon" fill="currentColor">
+          <use xlink:href="assets/bootstrap-icons.svg#plus" />
+        </svg>
+      </button>
+    </div>
+
+  </div>
+  <small class="form-text text-muted" *ngIf="hint">{{hint}}</small>
+
+</div>
\ No newline at end of file
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts
new file mode 100644
index 000000000..582775da4
--- /dev/null
+++ b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TagsComponent } from './tags.component';
+
+describe('TagsComponent', () => {
+  let component: TagsComponent;
+  let fixture: ComponentFixture<TagsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TagsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TagsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
new file mode 100644
index 000000000..7b5a36e90
--- /dev/null
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -0,0 +1,96 @@
+import { ThrowStmt } from '@angular/compiler';
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
+import { TagEditDialogComponent } from 'src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component';
+import { PaperlessTag } from 'src/app/data/paperless-tag';
+import { TagService } from 'src/app/services/rest/tag.service';
+
+@Component({
+  providers: [{
+    provide: NG_VALUE_ACCESSOR,
+    useExisting: forwardRef(() => TagsComponent),
+    multi: true
+  }],
+  selector: 'app-input-tags',
+  templateUrl: './tags.component.html',
+  styleUrls: ['./tags.component.css']
+})
+export class TagsComponent implements OnInit, ControlValueAccessor {
+
+  constructor(private tagService: TagService, private modalService: NgbModal) { }
+
+
+  onChange = (newValue: number[]) => {};
+  
+  onTouched = () => {};
+
+  writeValue(newValue: number[]): void {
+    this.value = newValue
+    if (this.tags) {
+      this.displayValue = newValue
+    }
+  }
+  registerOnChange(fn: any): void {
+    this.onChange = fn;
+  }
+  registerOnTouched(fn: any): void {
+    this.onTouched = fn;
+  }
+  setDisabledState?(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  ngOnInit(): void {
+    this.tagService.listAll().subscribe(result => {
+      this.tags = result.results
+      this.displayValue = this.value
+    })
+  }
+
+  @Input()
+  disabled = false
+
+  @Input()
+  hint
+
+  value: number[]
+
+  displayValue: number[] = []
+
+  tags: PaperlessTag[]
+
+  getTag(id) {
+    return this.tags.find(tag => tag.id == id)
+  }
+
+  removeTag(id) {
+    let index = this.displayValue.indexOf(id)
+    if (index > -1) {
+      this.displayValue.splice(index, 1)
+      this.onChange(this.displayValue)
+    }
+  }
+
+  addTag(id) {
+    let index = this.displayValue.indexOf(id)
+    if (index == -1) {
+      this.displayValue.push(id)
+      this.onChange(this.displayValue)
+    }
+  }
+
+
+  createTag() {
+    var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
+    modal.componentInstance.dialogMode = 'create'
+    modal.componentInstance.success.subscribe(newTag => {
+      this.tagService.list().subscribe(tags => {
+        this.tags = tags.results
+        this.addTag(newTag.id)
+      })
+    })
+  }
+
+}
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 23981aa47..577b61a55 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -3,19 +3,19 @@
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#trash" />
         </svg>
-        Delete
+        <span class="d-none d-lg-inline">Delete</span>
     </button>
     <a [href]="downloadUrl" class="btn btn-sm btn-outline-secondary mr-2">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#download" />
         </svg>
-        Download
+        <span class="d-none d-lg-inline">Download</span>
     </a>
     <button type="button" class="btn btn-sm btn-outline-secondary" (click)="close()">
         <svg class="buttonicon" fill="currentColor">
             <use xlink:href="assets/bootstrap-icons.svg#x" />
         </svg>
-        Close
+        <span class="d-none d-lg-inline">Close</span>
     </button>
 </app-page-header>
 
@@ -43,26 +43,9 @@
 
             <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type_id" allowNull="true" (createNew)="createDocumentType()"></app-input-select>
 
-            <div class="form-group">
-                <label for="exampleFormControlTextarea1">Tags</label>
+            <app-input-tags formControlName="tags_id" title="Tags"></app-input-tags>
 
-                <div class="input-group">
-                    <select multiple class="form-control" id="tags" formControlName="tags_id">
-                        <option *ngFor="let t of tags" [ngValue]="t.id">{{t.name}}</option>
-                    </select>
-
-                    <div class="input-group-append">
-                        <button class="btn btn-outline-secondary" type="button" (click)="createTag()">
-                            <svg class="buttonicon" fill="currentColor">
-                                <use xlink:href="assets/bootstrap-icons.svg#plus" />
-                            </svg>
-                        </button>
-                    </div>
-
-                </div>
-                <small class="form-text text-muted">Hold CTRL to (de)select multiple tags.</small>
-
-            </div>
+            <button type="button" class="btn btn-outline-secondary" (click)="discard()">Discard</button>&nbsp;
             <button type="button" class="btn btn-outline-primary" (click)="saveEditNext()" *ngIf="hasNext()">Save & edit next</button>&nbsp;
             <button type="submit" class="btn btn-primary">Save</button>&nbsp;
         </form>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index fb6be56aa..571192b04 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -33,7 +33,6 @@ export class DocumentDetailComponent implements OnInit {
 
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
-  tags: PaperlessTag[]
 
   documentForm: FormGroup = new FormGroup({
     title: new FormControl(''),
@@ -50,7 +49,6 @@ export class DocumentDetailComponent implements OnInit {
     private route: ActivatedRoute,
     private correspondentService: CorrespondentService,
     private documentTypeService: DocumentTypeService,
-    private tagService: TagService,
     private datePipe: DatePipe,
     private router: Router,
     private modalService: NgbModal,
@@ -64,7 +62,6 @@ export class DocumentDetailComponent implements OnInit {
 
     this.correspondentService.list(1,100000).subscribe(result => this.correspondents = result.results)
     this.documentTypeService.list(1,100000).subscribe(result => this.documentTypes = result.results)
-    this.tagService.list(1,100000).subscribe(result => this.tags = result.results)
 
     this.route.paramMap.subscribe(paramMap => {
       this.documentId = +paramMap.get('id')
@@ -88,17 +85,6 @@ export class DocumentDetailComponent implements OnInit {
     this.documentForm.patchValue(doc)
   }
 
-  createTag() {
-    var modal = this.modalService.open(TagEditDialogComponent, {backdrop: 'static'})
-    modal.componentInstance.dialogMode = 'create'
-    modal.componentInstance.success.subscribe(newTag => {
-      this.tagService.list().subscribe(tags => {
-        this.tags = tags.results
-        this.documentForm.get('tags_id').setValue(this.documentForm.get('tags_id').value.concat([newTag.id]))
-      })
-    })
-  }
-
   createDocumentType() {
     var modal = this.modalService.open(DocumentTypeEditDialogComponent, {backdrop: 'static'})
     modal.componentInstance.dialogMode = 'create'
@@ -121,28 +107,14 @@ export class DocumentDetailComponent implements OnInit {
     })
   }
 
-  getTag(id: number): PaperlessTag {
-    return this.tags.find(tag => tag.id == id)
+  discard() {
+    this.documentsService.get(this.documentId).subscribe(doc => {
+      Object.assign(this.document, doc)
+      this.title = doc.title
+      this.documentForm.patchValue(doc)
+    }, error => {this.router.navigate(['404'])})
   }
 
-  getColour(id: number) {
-    return TAG_COLOURS.find(c => c.id == this.getTag(id).colour)
-  }
-
-  addTag(id: number) {
-    if (this.documentForm.value.tags.indexOf(id) == -1) {
-      this.documentForm.value.tags.push(id)
-    }
-  }
-
-  removeTag(id: number) {
-    let index = this.documentForm.value.tags.indexOf(id)
-    if (index > -1) {
-      this.documentForm.value.tags.splice(index, 1)
-    }
-  }
-
-
   save() {    
     this.documentsService.update(this.document).subscribe(result => {
       this.close()
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.ts b/src-ui/src/app/services/rest/abstract-paperless-service.ts
index c8459f080..cdf157aaa 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.ts
@@ -40,6 +40,10 @@ export abstract class AbstractPaperlessService<T extends ObjectWithId> {
     return this.http.get<Results<T>>(this.getResourceUrl(), {params: httpParams})
   }
 
+  listAll(ordering?: string, extraParams?): Observable<Results<T>> {
+    return this.list(1, 100000, ordering, extraParams)
+  }
+
   get(id: number): Observable<T> {
     return this.http.get<T>(this.getResourceUrl(id))
   }

From cfd55a4d6b3a7863af7e052e2178e872015745cc Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 17:25:59 +0100
Subject: [PATCH 06/12] updated readme

---
 Dockerfile | 2 ++
 README.md  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 85eadc21e..3b58d3ff5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"
+
 ###############################################################################
 ### Front end                                                               ###
 ###############################################################################
diff --git a/README.md b/README.md
index 7b4ea0de0..551f19b09 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 [Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. This project extends on the project and modernizes many things.
 
+Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below.
+
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
@@ -18,7 +20,7 @@ Here's what you get:
 
 ![The before and after](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
-# What is different in this version of Paperless?
+# What is different in Paperless-ng?
 
 This is a list of changes that have been made to the original project.
 

From 2de4f2727819794087ebc5dca5a9b07621ed6986 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 17:26:26 +0100
Subject: [PATCH 07/12] removed pinpoint fragmenter as it was screwing up
 highlighting

---
 src/documents/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/documents/views.py b/src/documents/views.py
index ce850f480..6818551f0 100755
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -190,7 +190,6 @@ class SearchView(APIView):
                 result_page = searcher.search_page(query_parser, page)
                 result_page.results.fragmenter = highlight.ContextFragmenter(
                     surround=50)
-                result_page.results.fragmenter = highlight.PinpointFragmenter()
                 result_page.results.formatter = index.JsonFormatter()
 
                 return Response(

From b0aaaa0af7b33afb55d14b8b91487dc2f4a821d2 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 17:26:49 +0100
Subject: [PATCH 08/12] allow document display with angular dev server

---
 src/paperless/settings.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index e6aa86217..bb71e4764 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -125,7 +125,12 @@ TEMPLATES = [
 # NEVER RUN WITH DEBUG IN PRODUCTION.
 DEBUG = __get_boolean("PAPERLESS_DEBUG", "NO")
 
-X_FRAME_OPTIONS = 'SAMEORIGIN'
+if DEBUG:
+    X_FRAME_OPTIONS = ''
+    # this should really be 'allow-from uri' but its not supported in any mayor
+    # browser.
+else:
+    X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # We allow CORS from localhost:8080
 CORS_ORIGIN_WHITELIST = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8080,https://localhost:8080").split(","))

From 216cc848b3664c1ee3623d72d04cfad4a3f500c4 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 18:14:21 +0100
Subject: [PATCH 09/12] updated readme

---
 README.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 551f19b09..b925fa89b 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
-[ en | [de](README-de.md) | [el](README-el.md) ]
-
-![Paperless](https://raw.githubusercontent.com/jonaswinkler/paperless/master/src/paperless/static/paperless/img/logo-dark.png)
-
-[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. This project extends on the project and modernizes many things.
+[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
 Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below.
 
+This project is still in development and some things may not work as expected.
+
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
@@ -20,7 +18,9 @@ Here's what you get:
 
 ![The before and after](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
-# What is different in Paperless-ng?
+# Why Paperless-ng?
+
+I wanted to make big changes to the project that will impact the way it is used by its users greatly. Among the users who currently use paperless in production there are probably many that don't want these changes right away. I also wanted to have more control over what goes into the code and what does not. Therefore, paperless-ng was created. NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ng.
 
 This is a list of changes that have been made to the original project.
 
@@ -86,9 +86,13 @@ Please be aware that this uses a postgres database instead of sqlite. If you wan
 
 Alternatively, you can install the dependencies and setup apache and a database server yourself. Details for that will be available in the documentation.
 
+# Migrating to paperless-ng
+
+Don't do it yet. The migrations are in place, but I have not verified yet that they work.
+
 # Documentation
 
-The documentation for Paperless is available on [ReadTheDocs](https://paperless.readthedocs.io/). Updated documentation for this project is not yet available.
+The documentation for Paperless is available on [ReadTheDocs](https://paperless-ng.readthedocs.io/). Updated documentation for this project is not yet available.
 
 # Affiliated Projects
 
@@ -99,11 +103,6 @@ Paperless has been around a while now, and people are starting to build stuff on
 * [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
-# Similar Projects
-
-There's another project out there called [Mayan EDMS](https://www.mayan-edms.com/) that has a surprising amount of technical overlap with Paperless.  Also based on Django and using a consumer model with Tesseract and Unpaper, Mayan EDMS is *much* more featureful and comes with a slick UI as well, but still in Python 2. It may be that Paperless consumes fewer resources, but to be honest, this is just a guess as I haven't tested this myself.  One thing's for certain though, *Paperless* is a **way** better name.
-
-
 # Important Note
 
 Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears).  This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.

From 77b2e15ea62bcec687e003283757dabe718db998 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 18:23:20 +0100
Subject: [PATCH 10/12] fixed filter not showing all tags/correspondents/types

---
 .../components/document-detail/document-detail.component.ts | 4 ++--
 .../app/components/filter-editor/filter-editor.component.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 571192b04..ad9a3ac07 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -60,8 +60,8 @@ export class DocumentDetailComponent implements OnInit {
       Object.assign(this.document, this.documentForm.value)
     })
 
-    this.correspondentService.list(1,100000).subscribe(result => this.correspondents = result.results)
-    this.documentTypeService.list(1,100000).subscribe(result => this.documentTypes = result.results)
+    this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
 
     this.route.paramMap.subscribe(paramMap => {
       this.documentId = +paramMap.get('id')
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index 8c47ceafb..dc23450c5 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -52,9 +52,9 @@ export class FilterEditorComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.correspondentService.list().subscribe(result => {this.correspondents = result.results})
-    this.tagService.list().subscribe(result => this.tags = result.results)
-    this.documentTypeService.list().subscribe(result => this.documentTypes = result.results)
+    this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results})
+    this.tagService.listAll().subscribe(result => this.tags = result.results)
+    this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
   }
 
   getRuleTypes() {

From ed5a4a2d3e914a96915b3293397cd2b7a8b9e624 Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 19:28:08 +0100
Subject: [PATCH 11/12] adjustable page size fixes #8

---
 .../document-list.component.html              |  2 +-
 .../filter-editor.component.html              |  3 -
 .../manage/settings/settings.component.html   | 86 ++++++++++++-------
 .../manage/settings/settings.component.ts     | 18 +++-
 src-ui/src/app/data/storage-keys.ts           |  5 ++
 .../services/document-list-view.service.ts    | 14 ++-
 6 files changed, 87 insertions(+), 41 deletions(-)

diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index b66cfbfa0..1455cabbc 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -73,7 +73,7 @@
   </div>
 </div>
 
-<ngb-pagination [pageSize]="25" [collectionSize]="docs.collectionSize" [(page)]="docs.currentPage" [maxSize]="5"
+<ngb-pagination [pageSize]="docs.currentPageSize" [collectionSize]="docs.collectionSize" [(page)]="docs.currentPage" [maxSize]="5"
   [rotate]="true" [boundaryLinks]="true" (pageChange)="reload()" aria-label="Default pagination"></ngb-pagination>
 
 <div *ngIf="displayMode == 'largeCards'">
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.html b/src-ui/src/app/components/filter-editor/filter-editor.component.html
index 1cca0fd7f..48780e950 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.html
@@ -1,8 +1,5 @@
 <div *ngFor="let rule of filterRules" class="form-row form-group">
   <div class="col-md-3 col-form-label">
-    <!-- <select class="form-control form-control-sm" [(ngModel)]="rule.type" (change)="rule.value = null">
-      <option *ngFor="let ruleType of getRuleTypes()" [ngValue]="ruleType">{{ruleType.name}}</option>
-    </select> -->
     <span>{{rule.type.name}}</span>
   </div>
   <div class="col">
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index e8931ccdf..146d0c1be 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -3,37 +3,61 @@
 </app-page-header>
 
 <!-- <p>items per page, documents per view type</p> -->
-<ul ngbNav #nav="ngbNav" class="nav-tabs">
-  <li [ngbNavItem]="1">
-    <a ngbNavLink>Document List Settings</a>
-    <ng-template ngbNavContent>
-    </ng-template>
-  </li>
-  <li [ngbNavItem]="2">
-    <a ngbNavLink>Saved views</a>
-    <ng-template ngbNavContent>
+<form [formGroup]="settingsForm" (ngSubmit)="saveSettings()">
 
-      <table class="table table-striped">
-        <thead>
-        <tr>
-          <th scope="col">Title</th>
-          <th scope="col">Show in dashboard</th>
-          <th scope="col">Show in sidebar</th>
-          <th scope="col">Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let config of savedViewConfigService.getConfigs()">
-          <td>{{ config.title }}</td>
-          <td>{{ config.showInDashboard }}</td>
-          <td>{{ config.showInSideBar }}</td>
-          <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteViewConfig(config)">Delete</button></td>
-        </tr>
-        </tbody>
-      </table>
+  <ul ngbNav #nav="ngbNav" class="nav-tabs">
+    <li [ngbNavItem]="1">
+      <a ngbNavLink>General settings</a>
+      <ng-template ngbNavContent>
 
-    </ng-template>
-  </li>
-</ul>
+        <h4>Document list</h4>
+        
+        <div class="form-row form-group">
+          <div class="col-md-3 col-form-label">
+            <span>Items per page</span>
+          </div>
+          <div class="col">
+        
+            <select class="form-control" formControlName="documentListItemPerPage">
+              <option [ngValue]="10">10</option>
+              <option [ngValue]="25">25</option>
+              <option [ngValue]="50">50</option>
+              <option [ngValue]="100">100</option>
+            </select>
+        
+          </div>
+        </div>
 
-<div [ngbNavOutlet]="nav" class="mt-2"></div>
\ No newline at end of file
+      </ng-template>
+    </li>
+    <li [ngbNavItem]="2">
+      <a ngbNavLink>Saved views</a>
+      <ng-template ngbNavContent>
+
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th scope="col">Title</th>
+              <th scope="col">Show in dashboard</th>
+              <th scope="col">Show in sidebar</th>
+              <th scope="col">Actions</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let config of savedViewConfigService.getConfigs()">
+              <td>{{ config.title }}</td>
+              <td>{{ config.showInDashboard }}</td>
+              <td>{{ config.showInSideBar }}</td>
+              <td><button type="button" class="btn btn-sm btn-outline-danger" (click)="deleteViewConfig(config)">Delete</button></td>
+            </tr>
+          </tbody>
+        </table>
+
+      </ng-template>
+    </li>
+  </ul>
+
+  <div [ngbNavOutlet]="nav" class="mt-2"></div>
+
+  <button type="submit" class="btn btn-primary">Save</button>
+</form>
\ No newline at end of file
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index c56cd6a78..e14c2bd7b 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -1,5 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
 import { SavedViewConfig } from 'src/app/data/saved-view-config';
+import { GENERAL_SETTINGS } from 'src/app/data/storage-keys';
+import { DocumentListViewService } from 'src/app/services/document-list-view.service';
 import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
 
 @Component({
@@ -9,11 +12,14 @@ import { SavedViewConfigService } from 'src/app/services/saved-view-config.servi
 })
 export class SettingsComponent implements OnInit {
 
-  constructor(
-    private savedViewConfigService: SavedViewConfigService
-  ) { }
+  settingsForm = new FormGroup({
+    'documentListItemPerPage': new FormControl(+localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT)
+  })
 
-  active
+  constructor(
+    private savedViewConfigService: SavedViewConfigService,
+    private documentListViewService: DocumentListViewService
+  ) { }
 
   ngOnInit(): void {
   }
@@ -22,4 +28,8 @@ export class SettingsComponent implements OnInit {
     this.savedViewConfigService.deleteConfig(config)
   }
 
+  saveSettings() {
+    localStorage.setItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage)
+    this.documentListViewService.updatePageSize()
+  }
 }
diff --git a/src-ui/src/app/data/storage-keys.ts b/src-ui/src/app/data/storage-keys.ts
index aa39b31d1..cc4a05ec2 100644
--- a/src-ui/src/app/data/storage-keys.ts
+++ b/src-ui/src/app/data/storage-keys.ts
@@ -1,3 +1,8 @@
 export const OPEN_DOCUMENT_SERVICE = {
   DOCUMENTS: 'open-documents-service:openDocuments'
+}
+
+export const GENERAL_SETTINGS = {
+  DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
+  DOCUMENT_LIST_SIZE_DEFAULT: 50
 }
\ No newline at end of file
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 0ea509863..e554f2c8f 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { cloneFilterRules, FilterRule } from '../data/filter-rule';
 import { PaperlessDocument } from '../data/paperless-document';
 import { SavedViewConfig } from '../data/saved-view-config';
+import { GENERAL_SETTINGS } from '../data/storage-keys';
 import { DocumentService, SORT_DIRECTION_DESCENDING } from './rest/document.service';
 
 
@@ -15,6 +16,7 @@ export class DocumentListViewService {
 
   documents: PaperlessDocument[] = []
   currentPage = 1
+  currentPageSize: number = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
   collectionSize: number
 
   currentFilterRules: FilterRule[] = []
@@ -39,7 +41,7 @@ export class DocumentListViewService {
 
     this.documentService.list(
       this.currentPage,
-      null,
+      this.currentPageSize,
       sortField,
       sortDirection,
       filterRules).subscribe(
@@ -64,7 +66,7 @@ export class DocumentListViewService {
   }
 
   getLastPage(): number {
-    return Math.ceil(this.collectionSize / 25)
+    return Math.ceil(this.collectionSize / this.currentPageSize)
   }
 
   hasNext(doc: number) {
@@ -98,5 +100,13 @@ export class DocumentListViewService {
     })
   }
 
+  updatePageSize() {
+    let newPageSize = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
+    if (newPageSize != this.currentPageSize) {
+      this.currentPageSize = newPageSize
+      //this.reload()
+    }
+  }
+
   constructor(private documentService: DocumentService) { }
 }

From 0c35d5a8c27457dbee6a34d5c00e3a940341fcdf Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Wed, 4 Nov 2020 19:38:05 +0100
Subject: [PATCH 12/12] added contributing.md

---
 CONTRIBUTING.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..08b19bdee
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,13 @@
+# Contributing
+
+If you feel that somethings is not working, please submit an issue. You can also ask questions on the issue tracker by tagging your question with the question tag.
+
+Pull requests are welcome, however, I will be a little bit more strict about what goes into the code and what does not. If you want to make a big change, please ask me about it first.
+
+* When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project.
+* Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change.
+
+However:
+
+* Bug fixes and are always welcome. Docker makes things easier, however, I alone cannot ensure that this runs on all platforms.
+* Improvements to the styling of the front-end are always welcome. I'm no expert in things UX, and simply copied one of the Bootstrap examples. I think it turned out rather good, but I just can't seem to get some things working properly.