appsembler / edx-platform

53%

main: 49%

LAST BUILD ON BRANCH shadinaif/nutmeg-resolve-conflicts-20220920

branch: shadinaif/nutmeg-resolve-conflicts-20220920

CHANGE BRANCH

x

Reset

Sync Branches

• shadinaif/nutmeg-resolve-conflicts-20220920
• account_deletion
• active_mig_courses
• active_sites_client
• add_cms_tiers
• add_tahoe_idp
• all_the_releases
• amc_perm
• amir/juniper-youtube-transcripts-api
• amir/sync-year-of-birth-sso
• auth0
• auth0_email_change
• auth0_login_form
• black/bugfix-tahoeuser-metadata-cache
• black/eventtracking-utils-userid-event-event
• black/feature-events-custom-reg-data
• black/main-site-redirect-exclude-completion-agg-api
• black/qa-feature-events-custom-reg-data
• bryan/bugfix-marketing-redirect-allowlist
• bryan/fix-tahoe-user-metadata-for-celery-events
• bryan/remove-certificate-generation-task-time-delay
• bryan/tahoe-user-metadata-event_context_fix
• bryan/whitelist-to-allowlist
• bugfix-tahoe-metadata-processor
• bugfix/ENG-97-catch-and-retry-yt-api-errs
• bugfix/RED-3716-instr-enrollments-missing-tahoe-metadata
• bugfix/a11y-fixes-settings-profile
• bugfix/appsembler-migrate-transcripts-encoding
• bugfix/bump-tahoe-idp-to-2.3.0
• bugfix/downgrade-edx-sga-to-v0.16-py35-compat
• bugfix/event-tahoe-metadata-missing-or-wrong-user
• bugfix/fix-segment-replication-for-fetch-js
• bugfix/py2neo-eol
• bugfix/remove-redundant-tpa-createuser-step
• bugfix/tahoeusermetadata-tests-fix-factory-sequence
• bugfix/update-segment-events-for-fake-ajs-next
• bugfix/use-tahoe-idp-2.4.3
• bugfix/use-tahoe-idp-2.5.1
• bugfix/video-block-yt-metadata-multitenant-url
• bump_idp
• bump_site_config
• cache_draft_fixes
• celery_fix_studentmodule
• certs_use_get_value_for_org
• chore-update-appsembler-codeowners
• chore/ENG-97-increase-yt--api-ready-timeout
• chore/dockerfile-sync-configs
• chore/update-reviewers-20230305
• chore/use-tahoe-idp-2.5.0
• config_client_bump
• config_client_fixes
• config_tracing
• course_author_role
• course_authors_studio
• course_import_task
• course_org_filter_is_bad
• coverage/shadinaif/use-tahoe-sites-apis
• del_onebyone
• delete_multiple_sites
• delete_site
• delete_stale_course
• dependabot/npm_and_yarn/lodash-es-4.17.21
• dependabot/npm_and_yarn/minimatch-and-plato-3.0.8
• dependabot/npm_and_yarn/moment-timezone-0.5.35
• dependabot/npm_and_yarn/multi-fb9f2361c8
• dependabot/npm_and_yarn/qs-and-body-parser-6.5.3
• dependabot/npm_and_yarn/scss-tokenizer-and-node-sass-0.4.3
• dependabot/npm_and_yarn/socket.io-parser-and-karma-4.2.4
• dependabot/npm_and_yarn/tar-and-node-sass-6.2.0
• dependabot/npm_and_yarn/webpack-dev-middleware-and-karma-webpack--removed
• disable_register_form
• docker
• dockerbuildgh
• duplicate_orgs
• enroll_welcome_course
• esther/improve-registration
• fa
• faclient
• feat/add-mandrill-subaccount-support
• feat/edx-sga-to-v.0.12.0
• feat/tahoe-idp-2.6.0
• fix-account-deletion-certs-doc-link
• fix/arabic-translation-placeholder
• fix/fix-workflow-configurations
• fix/host-header-injection-vulnerabilit
• fix/logout-sanitize-redirecturl
• fix/segment-fetch-interception
• fix/speed-up-course-contents-page
• fix_amc_admin_form
• fix_docker_push
• fix_edxuuid_bug
• flag_note
• group_idp
• idp_metadata
• idp_no_logistration
• idp_reg_api
• idp_tests_fixes
• init_api_adapter
• intgr_support
• john/user-api-date-joined
• jose
• learning_context
• logout_url
• main
• matej/fix-sass-compile
• maxi/cherry-pick-studio-certificate-bugfix
• maxi/course-theme-helper
• maxi/enforce_celery_grading_routing_keys
• maxi/fix-fetch-custom-domains-command
• migration_command_fixes
• nutmeg_only
• omar/sample-index
• outdated
• password_reg_v2
• password_reset_auth0
• pr-action-bump
• preview_signin
• refactor_property
• register_url
• remove-anders-from-codeowners
• remove-esther-codeowners
• remove_course_creator
• remove_edx_uuid
• remove_pre_prod_scripts
• remove_unlinked_course
• reqs_cleanup
• reqs_fa
• revert-1196-init_api_adapter
• revert-1217-shadinaif/fix-resume-course-404
• revert-maxi/fix-progress-graph
• s_auth0_idp
• sass_v2_support
• save_cli
• secret_admin
• shadinaif/add-get_redirect_to_lms_login_url
• shadinaif/add-remove_deletable_courses-command
• shadinaif/add-resume_to-view
• shadinaif/celery-sync-mode
• shadinaif/disable-docker-build-except-main
• shadinaif/discovery-page-limit-to-100
• shadinaif/enrollment-api-check-key
• shadinaif/fix-bug-rescore-problem
• shadinaif/fix-enrollment-course-id
• shadinaif/fix-get-users-api
• shadinaif/fix-resume-course-404
• shadinaif/fix-site-view-listing
• shadinaif/fix-tahoe-sites-cannot-import
• shadinaif/hide-api-doc
• shadinaif/no-studio-login-form
• shadinaif/nutmeg-resolve-conflicts-20220916
• shadinaif/nutmeg-resolve-conflicts-20220922
• shadinaif/nutmeg-resolve-conflicts-20220927
• shadinaif/nutmeg-reverts-01
• shadinaif/nutmeg-tutor-01
• shadinaif/nutmeg-upgrade-01
• shadinaif/nutmeg-upgrade-02
• shadinaif/nutmeg-upgrade-03
• shadinaif/nutmeg-upgrade-04
• shadinaif/nutmeg-upgrade-05
• shadinaif/nutmeg-upgrade-06
• shadinaif/nutmeg-upgrade-requirements
• shadinaif/remove-ENABLE_CONFIG_VALUES_MODIFIER
• shadinaif/remove-estherjsuh-add-shadinaif
• shadinaif/remove-tpa_admin
• shadinaif/remove-waffel
• shadinaif/remove_FIX_ENROLLMENT_RESULTS_BUG
• shadinaif/remove_edx_uuid
• shadinaif/resolve-conflicts-20221004
• shadinaif/restore-dropped-urls
• shadinaif/studio-logout-fix
• shadinaif/studio-sso
• shadinaif/studio-sso-add-menu-link
• shadinaif/studio-sso-magiclink
• shadinaif/tahoe-sites-1.2.0
• shadinaif/use-archive-for-our-forked-packages
• shadinaif/use-figures-v0.1.1
• shadinaif/use-forked-analytics-python
• shadinaif/use-forked-proctoring
• shadinaif/use-tahoe-sites-api-patch02
• shadinaif/use-tahoe-sites-api-patch03
• shadinaif/use-tahoe-sites-api-patch03b
• shadinaif/use-tahoe-sites-apis
• shadinaif/use-tahoe-sites-patch04b
• shadinaif/use-tahoe-sites-patch05
• shadinaif/use-tahoe-sites-v1.0.0
• shadinaif/user_id-segment-integration
• site_cache_clear
• site_config_bump
• site_config_bump023
• skip_upstream_broken_tests
• studio_configs
• studio_configs_3rd_take
• sync_nutmeg
• tahoe-sites
• tahoe2_migrate
• tahoe_sites_132
• tahoe_sites_amc
• tahoeusermetadata-expect-data-wrapper
• test_tests
• tiers_middleware
• tiers_middleware_ported
• tox_pep8_dir
• tutor_theme
• use-tahoe-sites-api-patch03
• use-tahoe-sites-api-patch04a
• vladyslav/add-sanitize-next-parameter-helper
• vladyslav/hide-html-elements-in-iframe
• vladyslav/improve-sanitize-url-method

Merge cc1ee2676 into ee30653cb