Commit Graph

7073 Commits

Author SHA1 Message Date
David Baumgold
79815acc6e Fall back on MITX_FEATURES env variable if FEATURES isn't found
For a smoother transition to the new world
2013-12-03 16:29:48 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
David Ormsbee
842355293d Merge pull request #1816 from edx/ormsbee/grading_tests
Add basic tests of gradeset iteration.
2013-12-03 11:24:00 -08:00
David Ormsbee
f10df353d2 Add basic tests of gradeset iteration. 2013-12-03 14:23:12 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Greg Price
62a25824df Merge pull request #1765 from edx/gprice/inline-discussion-a11y
Improve accessibility of inline discussions
2013-12-02 15:12:19 -08:00
polesye
0dbb7603fb BLD-533: Improve calculator's tooltip accessibility. 2013-12-02 09:56:24 +02:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Julia Hansbrough
30cd57f539 New migrations file 2013-11-27 15:16:25 +00:00
Julia Hansbrough
280e3c3856 Merge conflicts 2013-11-27 14:43:16 +00:00
vagrant
006b8f8298 Removed old migration 2013-11-27 14:38:59 +00:00
Jay Zoldak
a56b9457a0 Rebase to re-prepare PR 2013-11-26 17:04:19 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
2013-11-26 16:30:55 -05:00
Calen Pennington
52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user
Co-author: Ned Batchelder <ned@edx.org>
2013-11-26 16:29:35 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
2013-11-26 16:29:35 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
2013-11-26 16:29:34 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report
CSV Reporting of Shopping Cart Purchases, with tests
2013-11-26 11:45:59 -08:00
Greg Price
81798dd8be Improve accessibility of inline discussions
The show/hide toggle now properly acts like a button, and focus is now
trapped on the loading element for both the show/hide action and loading
of a new page.
2013-11-26 14:12:34 -05:00
David Baumgold
389df17320 Merge pull request #1748 from puntxo/patch-1
Update course_navigation.html #os
2013-11-26 07:28:04 -08:00
Julia Hansbrough
b822df4ee2 Added refund datetime info to Orders, OrderItems
Finance would like to have info about the date any given refund is requested.

This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.

When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.

Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
2013-11-25 21:57:46 +00:00
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Ned Batchelder
cccd61ebf3 Make remaining dialogs in wiki accessible.
All the dialogs in the wiki are now accessible to screen readers.

Also, the "Switch to selected version" button did the odd thing of
reloading the page with the new version selected, but inside a dialog.
That is now fixed.

The merge dialog has a warning that looks kind of funky still, but you
can read it, unlike the previous code.

LMS-1337
2013-11-25 16:05:05 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Julia Hansbrough
fe5e2b3527 Refunding CertificateItem now marks parent Order refunded as well 2013-11-25 18:55:58 +00:00
Diana Huang
7a56e00d53 Merge pull request #1604 from edx/jarv/verified-certs
Jarv/verified certs
2013-11-25 07:37:13 -08:00
Jason Bau
e7b386c40a fixes a branding test which was passing for a trivial (wrong) reason 2013-11-22 23:18:11 -08:00
Adam Palay
24aa0decb4 fix OrgInstructorRole definition and add tests 2013-11-22 13:00:45 -05:00
Calen Pennington
c0f570ceab Fix [LMS-1528] (500 error when checking for beta access) 2013-11-22 13:00:45 -05:00
Calen Pennington
820e771171 Add failing test for [LMS-1528]
Also cleans up test_view_authentication to use user factories for
various user classes
2013-11-22 13:00:45 -05:00
Adam Palay
cf524906e0 more granular transactions in grading [LMS-1480]
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
2013-11-22 12:02:35 -05:00
Diana Huang
8d564f219d Use Choices to track possible modes. 2013-11-22 11:22:49 -05:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev.
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
2013-11-22 10:06:34 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
2013-11-22 10:06:28 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
polesye
b7438bc9a4 BLD-400: Update the calculator hints tooltip. 2013-11-22 12:18:52 +02:00
puntxo
7606810c30 Update course_navigation.html
The tab names are not being translated
2013-11-22 10:10:06 +01:00
Jason Bau
835893c2ed Merge pull request #1736 from edx/jbau/fix/cw-migrations
Fix 0010 courseware migration
2013-11-21 13:54:09 -08:00
Jason Bau
f0874d41c4 Fix 0010 courseware migration 2013-11-20 20:39:40 -08:00
Diana Huang
696f1df043 Pass through the certificate mode correctly. 2013-11-20 17:05:57 -05:00
Adam Palay
7b72a18551 more granular transactions in grading [LMS-1480]
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
2013-11-20 14:40:32 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds
Set empty aws credentials to None.
2013-11-20 07:57:16 -08:00
Diana Huang
d72b61a5b0 Use class methods to find the enrollment mode. 2013-11-19 17:30:27 -05:00
Diana Huang
1656876699 If student has not passed verification, issue an honor code cert.
Also, display a message on their dashboard.
2013-11-19 17:12:49 -05:00
John Jarvis
7a24f2036c Merge pull request #1718 from edx/jarv/fix-static-url
'ignore' shouldn't be use for ascii conversion
2013-11-19 11:38:28 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion
The input string is not expected to contain any unicode characters
2013-11-19 14:34:06 -05:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children
The forcing of IDs to non-draft must happen in base.py instead of draft....
2013-11-19 11:18:54 -08:00
Diana Huang
fc46efb6c7 Fix bug in grabbing course enrollments.
LMS-1475
2013-11-19 14:03:05 -05:00