Skip to content
Permalink
Browse files

Merge branch 'master' into cleanup

  • Loading branch information...
charmander committed Mar 19, 2019
2 parents 2be2f3a + 392452b commit aca7623fdf03e835465704ce954ccc1931ffb55f
@@ -1,8 +1,3 @@
path_classifiers:
library:
- static/pdf
- exclude: static/pdf/viewer.js

extraction:
javascript:
index:
@@ -3098,6 +3098,11 @@ img + #detail-art-text {
margin-top: 2rem;
}

#detail-art-text.pdf {
display: inline-block;
max-width: none;
}

#detail-flash {
text-align: center;
}
@@ -20,5 +20,5 @@ WebOb>=1.8.3 # hack for Pyramid 1.10 with existing packages
WebTest==2.0.33
pyotp==2.2.6 # For Two-Factor Authentication
qrcodegen==1.2.0 # For Two-Factor Authentication
cryptography==2.4.2 # For Two-Factor Authentication
cryptography==2.6.1 # For Two-Factor Authentication
publicsuffixlist==0.6.3 # For extracting the base domain for the email blacklist
@@ -24,18 +24,18 @@
],
},
install_requires=[
'alembic==1.0.7',
'alembic==1.0.8',
'anyjson==0.3.3',
'arrow==0.13.0',
'bcrypt==3.1.6',
'dogpile.cache==0.7.1',
'lxml==4.3.1',
'lxml==4.3.0',
'misaka==1.0.3+weasyl.6', # https://github.com/Weasyl/misaka
'oauthlib==2.1.0',
'psycopg2cffi==2.7.7',
'pytz==2018.9',
'sanpera==0.1.1+weasyl.6', # https://github.com/Weasyl/sanpera
'sqlalchemy==1.2.18',
'sqlalchemy==1.3.1',
'translationstring==1.3',
'backports.lzma==0.0.12;python_version<"3.3"',
'enum34==1.1.6;python_version<"3.4"',

0 comments on commit aca7623

Please sign in to comment.
You can’t perform that action at this time.