mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-04-02 13:45:10 -05:00
apply some patches from @brookst
This commit is contained in:
parent
40e79a731f
commit
91cecd47af
@ -1,13 +1,13 @@
|
|||||||
apipkg==1.4
|
apipkg==1.5
|
||||||
attrs==18.1.0
|
attrs==18.1.0
|
||||||
certifi==2018.4.16
|
certifi>=2018.8.24
|
||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
coverage==4.5.1
|
coverage==4.5.1
|
||||||
coveralls==1.3.0
|
coveralls==1.4.0
|
||||||
dateparser==0.7.0
|
dateparser==0.7.0
|
||||||
django-cors-headers==2.4.0
|
django-cors-headers==2.4.0
|
||||||
django-crispy-forms==1.7.2
|
django-crispy-forms==1.7.2
|
||||||
django-extensions==2.0.7
|
django-extensions==2.1.0
|
||||||
django-filter==2.0.0
|
django-filter==2.0.0
|
||||||
django-flat-responsive==2.0
|
django-flat-responsive==2.0
|
||||||
django>=2.0
|
django>=2.0
|
||||||
@ -15,7 +15,7 @@ djangorestframework==3.8.2
|
|||||||
docopt==0.6.2
|
docopt==0.6.2
|
||||||
execnet==1.5.0
|
execnet==1.5.0
|
||||||
factory-boy==2.11.1
|
factory-boy==2.11.1
|
||||||
faker==0.8.15
|
faker==0.9.0
|
||||||
filemagic==1.6
|
filemagic==1.6
|
||||||
flake8==3.5.0
|
flake8==3.5.0
|
||||||
fuzzywuzzy==0.15.0
|
fuzzywuzzy==0.15.0
|
||||||
@ -27,7 +27,7 @@ mccabe==0.6.1
|
|||||||
more-itertools==4.1.0
|
more-itertools==4.1.0
|
||||||
pdftotext==2.0.2
|
pdftotext==2.0.2
|
||||||
pillow==5.1.0
|
pillow==5.1.0
|
||||||
pluggy==0.6.0
|
pluggy==0.7.1
|
||||||
py==1.5.3
|
py==1.5.3
|
||||||
pycodestyle==2.3.1
|
pycodestyle==2.3.1
|
||||||
pyflakes==1.6.0
|
pyflakes==1.6.0
|
||||||
|
@ -32,7 +32,7 @@ def realign_senders(apps, schema_editor):
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0002_auto_20151226_1316'),
|
('documents', '0002_auto_20151226_1316'),
|
||||||
]
|
]
|
||||||
|
@ -6,7 +6,7 @@ from django.db import migrations
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0010_log'),
|
('documents', '0010_log'),
|
||||||
]
|
]
|
||||||
|
@ -112,7 +112,7 @@ def move_documents_and_create_thumbnails(apps, schema_editor):
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0011_auto_20160303_1929'),
|
('documents', '0011_auto_20160303_1929'),
|
||||||
]
|
]
|
||||||
|
@ -128,7 +128,7 @@ def do_nothing(apps, schema_editor):
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0013_auto_20160325_2111'),
|
('documents', '0013_auto_20160325_2111'),
|
||||||
]
|
]
|
||||||
|
@ -15,7 +15,7 @@ def reverse_func(apps, schema_editor):
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0018_auto_20170715_1712'),
|
('documents', '0018_auto_20170715_1712'),
|
||||||
]
|
]
|
||||||
|
@ -12,7 +12,7 @@ def set_added_time_to_created_time(apps, schema_editor):
|
|||||||
doc.save()
|
doc.save()
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
atomic = False
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('documents', '0019_add_consumer_user'),
|
('documents', '0019_add_consumer_user'),
|
||||||
]
|
]
|
||||||
|
@ -82,14 +82,13 @@ if os.getenv("PAPERLESS_INSTALLED_APPS"):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
MIDDLEWARE_CLASSES = [
|
MIDDLEWARE = [
|
||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'corsheaders.middleware.CorsMiddleware',
|
'corsheaders.middleware.CorsMiddleware',
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
]
|
]
|
||||||
@ -99,9 +98,9 @@ CORS_ORIGIN_WHITELIST = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "localho
|
|||||||
|
|
||||||
# If auth is disabled, we just use our "bypass" authentication middleware
|
# If auth is disabled, we just use our "bypass" authentication middleware
|
||||||
if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")):
|
if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")):
|
||||||
_index = MIDDLEWARE_CLASSES.index("django.contrib.auth.middleware.AuthenticationMiddleware")
|
_index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware")
|
||||||
MIDDLEWARE_CLASSES[_index] = "paperless.middleware.Middleware"
|
MIDDLEWARE[_index] = "paperless.middleware.Middleware"
|
||||||
MIDDLEWARE_CLASSES.remove("django.contrib.auth.middleware.SessionAuthenticationMiddleware")
|
MIDDLEWARE.remove("django.contrib.auth.middleware.SessionAuthenticationMiddleware")
|
||||||
|
|
||||||
ROOT_URLCONF = 'paperless.urls'
|
ROOT_URLCONF = 'paperless.urls'
|
||||||
|
|
||||||
|
19
src/reminders/migrations/0002_auto_20180824_2018.py
Normal file
19
src/reminders/migrations/0002_auto_20180824_2018.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 2.1 on 2018-08-24 20:18
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('reminders', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='reminder',
|
||||||
|
name='document',
|
||||||
|
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='documents.Document'),
|
||||||
|
),
|
||||||
|
]
|
@ -4,7 +4,7 @@ from django.db import models
|
|||||||
class Reminder(models.Model):
|
class Reminder(models.Model):
|
||||||
|
|
||||||
document = models.ForeignKey(
|
document = models.ForeignKey(
|
||||||
"documents.Document", on_delete=models.DO_NOTHING
|
"documents.Document", on_delete=models.PROTECTION
|
||||||
)
|
)
|
||||||
date = models.DateTimeField()
|
date = models.DateTimeField()
|
||||||
note = models.TextField(blank=True)
|
note = models.TextField(blank=True)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user