Skip to content

Bring dev changes into master #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jrwdunham wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Bring dev changes into master #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion onlinelinguisticdatabase/config/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ def make_app(global_conf, full_stack=False, static_files=True, **app_conf):

# Routing/Session Middleware
app = RoutesMiddleware(app, config['routes.map'], singleton=False)
app = SessionMiddleware(app, config)
app = SessionMiddleware(
app,
config,
samesite='None',
secure=True)

# At some point it seems that Pylons converts the Content-Type of any
# response without a 200 OK status to 'text/html; charset=utf-8'. Well
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def fixer(match):
"Topic :: Education"
],
install_requires=[
"Beaker==1.10.0",
"WebTest<2.0", # WebTest 2.0.1 requires WebOb>=1.2 and OLD needs WebOb <=1.1.1 -- conflict
"Pylons==1.0",
"FormEncode==1.2.4", # vs. >= 1.2.5 include changes that break the OLD
Expand Down