Skip to content

Port hawthorn changes into Juniper - #841

Merged
OmarIthawi merged 34 commits into
mainfrom
omar/hawthorn-sync
Mar 15, 2021
Merged

Port hawthorn changes into Juniper#841
OmarIthawi merged 34 commits into
mainfrom
omar/hawthorn-sync

Conversation

@OmarIthawi

@OmarIthawi OmarIthawi commented Mar 12, 2021

Copy link
Copy Markdown

This PR is a duplicate of the automated #795 pull request. I've made this PR to resolve conflicts.

bryanlandia and others added 30 commits December 18, 2020 00:59
Return the first instead to keep from failing outside of Tahoe SaaS
when we may have more than one Organization per Site
Use FEATURE setting to enable Honor mode auto-certs
Committing Omar's suggestions
Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Fix settings imports for Tahoe certs signals changes for Honor auto-certs, related tests.

Add related default FEATURE setting in appsembler.settings
…rts-for-honor

Allow auto-generation of certs (e.g., on passing grade) for Honor mode
…-multiple-site-orgs

UNIFICATION: get_current_organization don't assume single Organization
Update translations (autogenerated message)
PyCharm notified me about this despite we never got this in production.
RedirectMiddleware: redirect function variable unshadow
lms organization middleware to make tiers expiration work in lms
bump django-tiers to v0.2.3 for trial expiration fixes
this seems like an important part of our code to be able to inspect
more easily in production.
add honeycomb tracing and context on registration API
 - added tests
 - added order_by parameter
 - refactored `_get_active_tiers_uuids` to isolate the Tiers import
get_active_sites() to return QuerySet
beeline: fix unhashable type: 'dict'
Use the django_sites_extensions RedirectMiddleware, but
if TAHOE_ENABLE_DOMAIN_REDIRECT_MIDDLEWARE enabled (default ON), then
insert related middleware classes before that standard redirect class.
committing Omar's suggestion

Co-authored-by: Omar Al-Ithawi <i@omardo.com>
…are-to-settings-plugins

Move RedirectMiddleware to appsembler.settings plugin
Rework get_lms_link_from_course_key using get_site_for_course

@OmarIthawi suggestion

Co-authored-by: Omar Al-Ithawi <i@omardo.com>

Fix import issue in get_lms_link_for_course_key
…urse-org

get_lms_link_from_course_key fallback to LMS base if no Site found
@OmarIthawi
OmarIthawi marked this pull request as ready for review March 12, 2021 12:26
bring hawthorn changes into the Juniper branch
@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.06%) to 40.124% when pulling 7960ef1 on omar/hawthorn-sync into a6089ab on main.

@OmarIthawi
OmarIthawi merged commit b857f3e into main Mar 15, 2021
@OmarIthawi
OmarIthawi deleted the omar/hawthorn-sync branch March 15, 2021 10:01
thraxil added a commit that referenced this pull request Mar 15, 2021
This reverts commit b857f3e, reversing
changes made to a6089ab.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants