Compare commits

..

1 Commits
0.3.3 ... 0.3.2

Author SHA1 Message Date
Daniel Quinn
717b4a2b49 Fixes #172
Introduce some creative code around setting of ALLOWED_HOSTS that defaults to ['*'].  Also added PAPERLESS_ALLOWED_HOSTS to paperless.conf.example with an explanation as to what it's for
2017-01-03 09:52:31 +00:00
6 changed files with 9 additions and 57 deletions

View File

@@ -1,14 +1,9 @@
Changelog
#########
* 0.3.3
* Thumbnails in the UI and a Django-suit -based face-lift courtesy of @ekw!
* Timezone, items per page, and default language are now all configurable,
also thanks to @ekw.
* 0.3.2
* Fix for `#172`_: defaulting ALLOWED_HOSTS to ``["*"]`` and allowing the
user to set her own value via ``PAPERLESS_ALLOWED_HOSTS`` should the need
* Fix for #172: defaulting ALLOWED_HOSTS to ``["*"]`` and allowing the user
to set her own value via ``PAPERLESS_ALLOWED_HOSTS`` should the need
arise.
* 0.3.1
@@ -162,5 +157,3 @@ Changelog
.. _#146: https://github.com/danielquinn/paperless/issues/146
.. _#148: https://github.com/danielquinn/paperless/pull/148
.. _#150: https://github.com/danielquinn/paperless/pull/150
.. _#172: https://github.com/danielquinn/paperless/issues/172

View File

@@ -95,20 +95,8 @@ PAPERLESS_SHARED_SECRET=""
# If you're planning on putting Paperless on the open internet, then you
# really should set this value to the domain name you're using. Failing to do
# so leaves you open to HTTP host header attacks:
# https://docs.djangoproject.com/en/1.10/topics/security/#host-headers-virtual-hosting
#
# so leaves you open to XSS attacks.
# Just remember that this is a comma-separated list, so "example.com" is fine,
# as is "example.com,www.example.com", but NOT " example.com" or "example.com,"
#PAPERLESS_ALLOWED_HOSTS="example.com,www.example.com"
# Override the default UTC time zone here
#PAPERLESS_TIME_ZONE=UTC
# Customize number of list items to show per page
#PAPERLESS_LIST_PER_PAGE=50
# Customize the default language that tesseract will attempt to use when parsing
# documents. It should be a 3-letter language code consistent with ISO 639.
#PAPERLESS_OCR_LANGUAGE=eng

View File

@@ -3,7 +3,6 @@ Pillow>=3.1.1
django-crispy-forms>=1.6.0
django-extensions>=1.6.1
django-filter>=1.0
django-suit>=0.2.23
djangorestframework>=3.4.4
filemagic>=1.6
langdetect>=1.0.5

View File

@@ -53,24 +53,13 @@ class DocumentAdmin(admin.ModelAdmin):
}
search_fields = ("correspondent__name", "title", "content")
list_display = ("created", "title", "thumbnail", "correspondent", "tags_")
list_display = ("created", "correspondent", "title", "tags_", "document")
list_filter = ("tags", "correspondent", MonthListFilter)
ordering = ["-created", "correspondent"]
list_per_page = 25
def created_(self, obj):
return obj.created.date().strftime("%Y-%m-%d")
def thumbnail(self, obj):
png_img = self._html_tag(
"img",
src="/fetch/thumb/{}".format(obj.id),
width=275,
alt="thumbnail",
title=obj.file_name
)
return self._html_tag("a", png_img, href=obj.download_url)
thumbnail.allow_tags = True
def tags_(self, obj):
r = ""
for tag in obj.tags.all():

View File

@@ -32,7 +32,7 @@ LOGIN_URL = '/admin/login'
ALLOWED_HOSTS = ["*"]
_allowed_hosts = os.getenv("PAPERLESS_ALLOWED_HOSTS")
if _allowed_hosts:
if allowed_hosts:
ALLOWED_HOSTS = _allowed_hosts.split(",")
# Tap paperless.conf if it's available
@@ -44,7 +44,6 @@ if os.path.exists("/etc/paperless.conf"):
INSTALLED_APPS = [
'suit',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -61,22 +60,6 @@ INSTALLED_APPS = [
]
SUIT_CONFIG = {
'ADMIN_NAME': 'Paperless',
'SEARCH_URL': '',
'LIST_PER_PAGE': int(os.getenv("PAPERLESS_LIST_PER_PAGE", 25)),
'HEADER_DATE_FORMAT': 'D m-d-Y',
'MENU': (
'sites',
{
'app': 'documents',
'label': 'Paperless',
'icon': 'icon-file',
'models': ('Document', 'Tag', 'Correspondent', 'log')
},
)
}
MIDDLEWARE_CLASSES = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -158,7 +141,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'en-us'
TIME_ZONE = os.getenv("PAPERLESS_TIME_ZONE", "UTC")
TIME_ZONE = 'UTC'
USE_I18N = True
@@ -204,7 +187,7 @@ LOGGING = {
# The default language that tesseract will attempt to use when parsing
# documents. It should be a 3-letter language code consistent with ISO 639.
OCR_LANGUAGE = os.getenv("PAPERLESS_OCR_LANGUAGE", "eng")
OCR_LANGUAGE = "eng"
# The amount of threads to use for OCR
OCR_THREADS = os.getenv("PAPERLESS_OCR_THREADS")

View File

@@ -1 +1 @@
__version__ = (0, 3, 3)
__version__ = (0, 3, 2)