Skip to content

Quick merge #106

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

Merged
MikeL270 merged 2 commits into from
Mar 2, 2026
Merged

Quick merge #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f71f0e
revert origin changes
MikeL270 Mar 2, 2026
5fe0d08
update config
MikeL270 Mar 2, 2026
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
4 changes: 3 additions & 1 deletion annotation_api/app/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ def create_app():

CORS(app, resources={
r'/api/*': {
'origins': app.config['ORIGIN_URLS'],
'origins': [
app.config['ORIGIN_URL']
],
'supports_credentials': True
}
})
Expand Down
2 changes: 1 addition & 1 deletion annotation_api/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class FlaskConfig:
PERMANENT_SESSION_LIFETIME = 86400 # 24 hours
SESSION_USE_SIGNER = (os.environ.get('SESSION_USE_SIGNER') or 'true').lower() in ['true', '1', 't', 'y', 'yes']
SESSION_REDIS = redis.from_url(os.environ.get('SESSION_REDIS'))
ORIGIN_URLS = os.environ.get('ORIGIN_URL').split(' ') #pyright: ignore
ORIGIN_URL = os.environ.get('ORIGIN_URL') #pyright: ignore
BUCKET_NAME = os.environ.get('BUCKET_NAME')

db_config = {
Expand Down
Loading