Add basic ul/ol/dl styling (especially for about pages) - #3403
Closed
caesar2164 wants to merge 383 commits into
Closed
Add basic ul/ol/dl styling (especially for about pages)#3403caesar2164 wants to merge 383 commits into
caesar2164 wants to merge 383 commits into
Conversation
…eviewed Assessment
…ease Giulio/peer grading style release
…e' into edx-west/release-candidate-20130711
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
because we've moved our password_reset_confirm.html into the theme repo. This reduces edx-west diff with master.
Conflicts: cms/djangoapps/contentstore/utils.py cms/templates/login.html cms/templates/widgets/header.html cms/templates/widgets/sock.html lms/envs/test.py
to cms settings (it was throwing 500s for Stanford when the CMS calls render_from_lms)
Adds a new Email link to the instructor dashboard for frontend interface to send email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this. Creates a new djangoapp bulk_email that handles this action by getting the recipient list and batching the emails to different celery tasks to do the actual sending. Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by retrying or falling through to the next email. Adds the option to opt out of course specific emails in the user dashboard with an Email Settings link for each course. Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL specifies the from address for email. EMAILS_PER_TASK specifies the number of emails each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER, EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings. Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
Conflicts: lms/djangoapps/courseware/tests/test_views.py
…e' into edx-west/release-candidate-20130729
…' into edx-west/release-candidate-20130729 Conflicts: common/lib/xmodule/xmodule/course_module.py lms/djangoapps/courseware/views.py lms/envs/aws.py lms/envs/common.py lms/templates/courseware/courseware.html
Edited CMS help links with zendesk info
Changed Lucile Packard Children's CME registration value.
Release for Mar 18, 2014 Conflicts: common/djangoapps/student/views.py common/lib/capa/capa/tests/test_responsetypes.py common/lib/xmodule/xmodule/capa_base.py lms/djangoapps/branding/__init__.py lms/djangoapps/class_dashboard/dashboard_data.py lms/djangoapps/class_dashboard/test/test_dashboard_data.py lms/djangoapps/class_dashboard/test/test_views.py lms/djangoapps/class_dashboard/views.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/instructor/views/legacy.py lms/envs/common.py lms/envs/dev.py lms/envs/test.py lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee lms/templates/class_dashboard/all_section_metrics.js lms/templates/class_dashboard/d3_stacked_bar_graph.js lms/templates/courseware/course_about.html lms/templates/courseware/instructor_dashboard.html lms/templates/dashboard.html lms/templates/dashboard/_dashboard_certificate_information.html lms/templates/instructor/instructor_dashboard_2/metrics.html lms/templates/main.html lms/urls.py
* HTML in the grade range label was getting passed through to the certificate agent via xqueue. This strips HTML before passing labels through. This change is being rolled into my PR to master for the /request_cert endpoint feature.
certs: /request_cert: add_cert() strips HTML
Support for displaying submissions API scores in Progress page.
Conflicts: cms/djangoapps/contentstore/views/component.py lms/djangoapps/courseware/tabs.py lms/djangoapps/courseware/views.py lms/templates/courseware/course_navigation.html lms/templates/courseware/courseware.html lms/templates/navigation.html lms/templates/problem.html requirements/edx/github.txt
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change. Fixes: AN-789
…link-middleware middleware to allow sneakpeek courses to deeplink
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/course_about.html
Clicking on any of the bars displays a list of students for that particular action (either opened the subsection or attempted the problem). Students are listed for the sub-sections. Students, grade and percent are listed for the problems. The on-screen list displays only the first 250 students with an overflow message if there are more students than that. The csv download lists all students.
edit checklist for edx-west
Contributor
Author
|
@talbs, @frrrances - would you look at this? |
Contributor
|
This pull request has over 250 commits and over 16000 lines changed. It also has conflicts with master. @caesar2164, can you check that this is what you meant to submit? |
Contributor
Author
|
@singingwolfboy - crap, I'll fix it. |
Contributor
Author
|
Closing in favor of #3435. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Open edX about pages are very limiting in their HTML element style support.
Here are a few changes that make it MUCH better!