- 15 Aug, 2013 2 commits
-
-
Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors, and rebasing on recent master.
Joe Blaylock committed -
So that instructors have easy access to the mapping from anonymized IDs (a simple MD5 hash of the user ID that's used when integrating with third-party services like Qualtrics) to user IDs, we have a simple Django management command to generate a CSV mapping. To run, use the following: rake django-admin[anonymized_id_mapping,<system>,<env>,<course_id>] And, of course, substitute the appropriate values for <system>, <env>, and <course_id>. (E.g., lms, dev, and MITx/6.002x/Circuits)
Nate Hardison committed
-
- 07 Aug, 2013 2 commits
-
-
Merge branch 'jinpa/check-off-edx-west-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130806
Sef Kloninger committed -
Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130806 Conflicts: common/lib/capa/capa/templates/choicegroup.html
Sef Kloninger committed
-
- 05 Aug, 2013 2 commits
-
-
We have found that users were getting confued by the buttons named "check," and on their last allowed attempt, "final check." Check looks implies something for the user only, not a real problem submission. So this changes the wording to "Submit" for most attempts, and "Final Submit" for the last attempt allowed. We (Stanford) had made a prior change to only say "Submit" on the final attempt, but condisering that now that seems even more confusing.
Sef Kloninger committed -
Per @jinpa: > Looking again now at the wording in 6eb78cc I'm worried that "saved > by not graded" doesn't make crystal clear that they haven't been > _submitted_. Given that we're not auto-submitting at the deadline > (someday let's add that feature), can we change the wording to: > "Your answers have been saved but not submitted. Click 'Submit' > when you're ready."
Sef Kloninger committed
-
- 04 Aug, 2013 1 commit
-
-
jinpa committed
-
- 02 Aug, 2013 4 commits
-
-
Giulio Gratta committed
-
Giulio Gratta committed
-
changing message that shows when users go forward and back from openended and fix save reload message
Giulio Gratta committed -
changing message that shows when users go forward and back from openended and fix save reload message
Giulio Gratta committed
-
- 01 Aug, 2013 1 commit
-
-
Giulio Gratta committed
-
- 31 Jul, 2013 4 commits
-
-
Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130729
Sef Kloninger committed -
Giulio Gratta committed
-
Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130729
Sef Kloninger committed -
As documented in Jira LMS-806: Steps to reproduce: * as one user, for a peer evaluated problem, enter something that needs peer grading * as another user, log in and fire up the peer grading panel. You should see something that needs attention, a yellow exclamation badge * clicking on the "do grading" panel will fail with a 500, stacktrace attached. * it's possible that the question where this is being done must first have professor calibration done in order for peers to be able to actually get work to grade. Don Mitchell debugged this with me and saw some problems in the ways that the peer_evaluation xmodule code was accessing dates. Instead of using the normal lms accessors, by going straight into the _module_data it would be bypassing some important code (caching?). Fixing this to be more standard did the trick.
Sef Kloninger committed
-
- 30 Jul, 2013 6 commits
-
-
Giulio Gratta committed
-
Sef Kloninger committed
-
Conflicts: common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
Sef Kloninger committed -
Giulio Gratta committed
-
Remove username from email footer.
Kevin Luo committed -
Conflicts: lms/static/sass/base/_variables.scss
Sef Kloninger committed
-
- 29 Jul, 2013 3 commits
-
-
Conflicts: common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
Sef Kloninger committed -
Revert hardcoded delay for course_email task
Kevin Luo committed -
Giulio Gratta committed
-
- 27 Jul, 2013 2 commits
-
-
Delay for possible race condition with fetching course email object. Use settings.SITE_NAME for host name to generate email footer url.
Kevin Luo committed -
Giulio Gratta committed
-
- 26 Jul, 2013 7 commits
-
-
Delay for possible race condition with fetching course email object. Use settings.SITE_NAME for host name to generate email footer url.
Kevin Luo committed -
Kevin Luo committed
-
Kevin Luo committed
-
Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' 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
Sef Kloninger committed -
Sarina Canelake committed
-
Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into edx-west/release-candidate-20130729
Sef Kloninger committed -
Conflicts: lms/djangoapps/courseware/tests/test_views.py
Sef Kloninger committed
-
- 25 Jul, 2013 6 commits
-
-
Kevin Luo committed
-
Kevin Luo committed
-
Fix failing acceptance test
Sarina Canelake committed -
Giulio Gratta committed
-
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>
Kevin Luo committed -
Sarina Canelake committed
-