Skip to content
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

Jump to bottom

Bring us back up to date with Upstream #39

Closed
wants to merge 17 commits into from
Closed

Bring us back up to date with Upstream #39

wants to merge 17 commits into from

Conversation

MaggieFero
Copy link
Collaborator

There are some nice security changes here, and a few other little bits as well.

hughrun and others added 13 commits January 20, 2024 13:19
@hughrun
fix multiple issues from user exports config changes
ddc35a7 
- improve nginx config
- fix DATA_UPLOAD_MAX_MEMORY_SIZE default not being an int
- translate fallback value in id_to_username template tag
- make location of setting to turn on user exports easier to locate for admins

fixes #3227
fixes #3231
fixes #3232
fixes #3236
@hughrun
fix comment in env example
a563275
@mouse-reeve
Fixes translation tags
9c5f6c5
@mouse-reeve
Merge branch 'main' into export-fixes
5f2f321
@BartSchuurmans
Add search for author
6c9ca0b
@dato
Support DATA_UPLOAD_MAX_MEMORY_MiB, only, in .env
4a9d69e 
Since arithmetic is not allowed in .env files, a change in unit for
the variable seems most usable.
@hughrun
Merge pull request #4 from dato/data_upload_max_size_mb
8773caa 
Support DATA_UPLOAD_MAX_MEMORY_MiB, only, in .env
@hughrun
Merge branch 'main' into export-fixes
46a158d
@fofwisdom
Adds production.conf security configuration missing in version 0.7.2
1c587c5
@mouse-reeve
Merge pull request #3274 from Minnozz/author-search
ec52460 
Add search for author
@mouse-reeve
Merge pull request #3284 from NetspherePub/072NginxSecurityFixed
6a70ead 
Adds production.conf security configuration missing in version 0.7.2
@mouse-reeve
Merge branch 'main' into export-fixes
2c59908
@mouse-reeve
Merge pull request #3238 from hughrun/export-fixes
354388c 
fix multiple issues from user exports config changes
@MaggieFero
Copy link
Collaborator Author

We're going to hold off on merging this until we've got the branch with our security upgrades running in prod, I think.

MaggieFero and others added 4 commits March 1, 2024 19:58
@MaggieFero
Add timeout to isbn.py
db97d76 
An instance of requests.get in isbn.py lacks a timeout, and this commit adds one with a default of 15 as used other places in the code, where requests.get does already have a timeout.
@MaggieFero
Add timeout to base_activity.py
1ae9870 
An instance of requests.get was missing a timeout; this commit adds a timeout of 15 as used in other places in this codebase which already have timeouts.
@MaggieFero
Typo fix
50b811d 
Add a comma
@mouse-reeve
Merge pull request #3300 from MaggieFero/MaggieFero-add-timeouts-to-r…
218171e 
…equests.get

Add timeouts to requests.get
@MaggieFero
Copy link
Collaborator Author

Actually, let's not do this for now, because we're submitting a PR to upstream right now and we'll catch up once it's merged.

@MaggieFero MaggieFero closed this Mar 2, 2024
@MaggieFero
Copy link
Collaborator Author

Hey! It's time! I'll open a new PR for this, and I expect it to be #50

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phildini phildini phildini approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@MaggieFero @phildini @hughrun @mouse-reeve @BartSchuurmans @dato @fofwisdom