Merge branch 'dev' into feature-use-celery

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html

@@ -64,9 +64,9 @@
      </div>
    </div>
    <div class="w-100 d-xxl-none"></div>
-   <div class="col col-xl-auto ps-0">
+   <div class="col col-xl-auto ps-xxl-0">
      <button class="btn btn-link btn-sm px-0" [disabled]="!rulesModified" (click)="resetSelected()">
-       <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x me-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+       <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x me-1 ms-n1" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
          <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
        </svg><ng-container i18n>Reset filters</ng-container>
      </button>

src-ui/src/app/data/paperless-document.ts

@@ -29,8 +29,6 @@ export interface PaperlessDocument extends ObjectWithId {
 
   content?: string
 
-  file_type?: string
-
   tags$?: Observable<PaperlessTag[]>
 
   tags?: number[]
@@ -47,7 +45,7 @@ export interface PaperlessDocument extends ObjectWithId {
 
   added?: Date
 
-  file_name?: string
+  original_file_name?: string
 
   download_url?: string
 

src-ui/src/environments/environment.prod.ts

@@ -5,7 +5,7 @@ export const environment = {
   apiBaseUrl: document.baseURI + 'api/',
   apiVersion: '2',
   appTitle: 'Paperless-ngx',
-  version: '1.9.0-dev',
+  version: '1.9.2-dev',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',