mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Merge branch 'main' into dev
This commit is contained in:
		@@ -1,5 +1,22 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## paperless-ngx 1.9.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Bug Fixes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Bugfix: Fixes missing OCR mode skip_noarchive [@stumpylog](https://github.com/stumpylog) ([#1645](https://github.com/paperless-ngx/paperless-ngx/pull/1645))
 | 
				
			||||||
 | 
					- Fix reset button padding on small screens [@shamoon](https://github.com/shamoon) ([#1646](https://github.com/paperless-ngx/paperless-ngx/pull/1646))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Documentation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Improve docs re [@janis-ax](https://github.com/janis-ax) ([#1625](https://github.com/paperless-ngx/paperless-ngx/pull/1625))
 | 
				
			||||||
 | 
					- [Documentation] Add v1.9.0 changelog [@github-actions](https://github.com/github-actions) ([#1639](https://github.com/paperless-ngx/paperless-ngx/pull/1639))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### All App Changes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Bugfix: Fixes missing OCR mode skip_noarchive [@stumpylog](https://github.com/stumpylog) ([#1645](https://github.com/paperless-ngx/paperless-ngx/pull/1645))
 | 
				
			||||||
 | 
					- Fix reset button padding on small screens [@shamoon](https://github.com/shamoon) ([#1646](https://github.com/paperless-ngx/paperless-ngx/pull/1646))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## paperless-ngx 1.9.0
 | 
					## paperless-ngx 1.9.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Features
 | 
					### Features
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@ export const environment = {
 | 
				
			|||||||
  apiBaseUrl: document.baseURI + 'api/',
 | 
					  apiBaseUrl: document.baseURI + 'api/',
 | 
				
			||||||
  apiVersion: '2',
 | 
					  apiVersion: '2',
 | 
				
			||||||
  appTitle: 'Paperless-ngx',
 | 
					  appTitle: 'Paperless-ngx',
 | 
				
			||||||
  version: '1.9.0-dev',
 | 
					  version: '1.9.2-dev',
 | 
				
			||||||
  webSocketHost: window.location.host,
 | 
					  webSocketHost: window.location.host,
 | 
				
			||||||
  webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
 | 
					  webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
 | 
				
			||||||
  webSocketBaseUrl: base_url.pathname + 'ws/',
 | 
					  webSocketBaseUrl: base_url.pathname + 'ws/',
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -130,7 +130,7 @@ def settings_values_check(app_configs, **kwargs):
 | 
				
			|||||||
        if settings.OCR_MODE not in {"force", "skip", "redo", "skip_noarchive"}:
 | 
					        if settings.OCR_MODE not in {"force", "skip", "redo", "skip_noarchive"}:
 | 
				
			||||||
            msgs.append(Error(f'OCR output mode "{settings.OCR_MODE}" is not valid'))
 | 
					            msgs.append(Error(f'OCR output mode "{settings.OCR_MODE}" is not valid'))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if settings.OCR_CLEAN not in {"clean", "clean-final"}:
 | 
					        if settings.OCR_CLEAN not in {"clean", "clean-final", "none"}:
 | 
				
			||||||
            msgs.append(Error(f'OCR clean mode "{settings.OCR_CLEAN}" is not valid'))
 | 
					            msgs.append(Error(f'OCR clean mode "{settings.OCR_CLEAN}" is not valid'))
 | 
				
			||||||
        return msgs
 | 
					        return msgs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
from typing import Final
 | 
					from typing import Final
 | 
				
			||||||
from typing import Tuple
 | 
					from typing import Tuple
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__version__: Final[Tuple[int, int, int]] = (1, 9, 0)
 | 
					__version__: Final[Tuple[int, int, int]] = (1, 9, 2)
 | 
				
			||||||
# Version string like X.Y.Z
 | 
					# Version string like X.Y.Z
 | 
				
			||||||
__full_version_str__: Final[str] = ".".join(map(str, __version__))
 | 
					__full_version_str__: Final[str] = ".".join(map(str, __version__))
 | 
				
			||||||
# Version string like X.Y
 | 
					# Version string like X.Y
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user