Commit Graph

17975 Commits

Author SHA1 Message Date
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
2014-01-06 17:02:31 -05:00
Greg Price
c44e527615 Remove unused forums-related cruft 2014-01-06 16:59:30 -05:00
Bertrand Marron
9372ba6ef7 Use <span> for course preview’s university
The course’s university was displayed using a <a> tag that points to
nothing ('#'). There was some stanford specific behavior to replace that
<a> tag with a <span>. This commit removes that.
2014-01-06 21:09:15 +01:00
Julia Hansbrough
95affba643 More response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
99e8596fea Response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
893acc57b6 Template changes 2014-01-06 15:53:28 +00:00
Julia Hansbrough
edd0b5436e Response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
68174dc33d Initial view 2014-01-06 15:53:28 +00:00
Julia Hansbrough
e3114a54b9 Migrations 2014-01-06 15:53:27 +00:00
Julia Hansbrough
cf5745ce59 Refactored tests 2014-01-06 15:53:27 +00:00
Julia Hansbrough
fa87793e9b Fixed UniversityRevenueShare model 2014-01-06 15:53:27 +00:00
Julia Hansbrough
1981ee5078 Fixed CertificateStatusReportModel 2014-01-06 15:53:27 +00:00
Julia Hansbrough
d3277c99b4 Initial PR for verified cert reporting
Refactored from code in Stanford's itemized revenue reports into a new Report class used for all revenue-related reporting.

Models for all cert types complete; test coverage for half of cert types complete.

If this architecture is deemed solid, the next steps are to add a reasonable UI folks will use to select reports to download, allow them to restrict based on dates/universities, and of course complete test coverage.
2014-01-06 15:53:27 +00:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems.
ORA-286
2014-01-06 19:13:28 +05:00
Ned Batchelder
c7cf0c6d3e Fixes to Translator comments found while debugging the i18n pipeline. 2014-01-03 17:50:16 -05:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
brianhw
5dccff518c Merge pull request #2008 from edx/brian/dump-inherited-metadata
Add options to dump_course_structure to output inherited metadata.
2014-01-03 12:53:57 -08:00
Brian Talbot
fcda913691 LMS: adds in developer-centric Sass file
* provides new .scss file for developers to add temporary/in-progress Sass for further refactor/polish
* cleans up note/import order in all application scss files
2014-01-03 13:52:13 -05:00
Brian Wilson
d0fea42902 Add tests for inherited metadata to test_dump_course, and move to commands/tests dir. 2014-01-03 10:32:42 -05:00
Brian Wilson
4569ee9daa Add options to dump_course_structure to output inherited metadata. 2014-01-03 10:32:42 -05:00
Ned Batchelder
39380f2d22 Very Minor tweaks to the LMS and CMS startup.
I was going to do something in the startup code, then changed my mind,
but didn't want to just discard these changes.
2014-01-02 14:27:52 -05:00
Adam Palay
e7f029f615 a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) 2013-12-30 16:11:20 -05:00
Adam
9f2c31d91e Merge pull request #2036 from edx/adam/remove-@edx-emails
removes references to specific edx email addresses (STUD-1069)
2013-12-30 08:20:56 -08:00
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Adam Palay
517ca9329b removes references to specific edx email addresses (STUD-1069) 2013-12-23 16:28:08 -05:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id
Change course_id to package_id
2013-12-23 11:15:48 -08:00
Adam Palay
b923521a47 corrects typo in legacy.py (LMS-1675) 2013-12-23 09:43:57 -05:00
Don Mitchell
b7368ef69a Change course_id to package_id
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
2013-12-20 16:16:50 -05:00
David Ormsbee
b1eff059a7 Merge pull request #2014 from edx/ormsbee/grade_distribution_fix
Fix (re-implement) answer distribution report generation.
2013-12-20 12:43:33 -08:00
David Ormsbee
0565fbbfab Fix (re-implement) answer distribution report generation.
This restores functionality that has been broken since the introduction of
XModuleDescriptor/XModule proxying (part of the XBlock transition). It generates
a CSV of all answers for all content of type "problem" in a given course, with a
row per (problem part, answer). The format is:

url_name, display name, answer id, answer, count

Example values:
  url_name = "7f1b1523a55848cd9f5c93eb8cbabcf7"
  display name = "Problem 1: Something Hard"
  answer id = i4x-JediAcdmy-LTSB304-problem-7f1b1523a55848cd9f5c93eb8cbabcf7_2_1
  answer = "Use the Force"
  count = 1138

Since it only grabs things of type "problem", it will not return results for
things like self/peer-assessments. Any Loncapa problem types will show up (so
multiple choice, text input, numeric, etc.)

Instead of crawling the course tree and instantiating the appropriate CapaModule
objects to grab state, this version draws directly from StudentModule. This lets
us skip a lot of processing and most importantly lets us generate the answer
distribution without causing side-effects (since XBlocks auto-save state). It
also lets us take advantage of a read-replica database if one is available, to
minimize locking concerns.

There are minor changes to the legacy dashboard around CSV charset encoding and
a change to OptionResponseXMLFactory to make it more unicode friendly. Answer
distribution output is now also sorted, to group together answers for the same
content piece.

Note that this does not introduce celery into the process. Answer distributions
are still only available for small courses.

This was originally created to fix [LMS-922], but it also addresses [LMS-811] and
possibly other areas in the legacy dashboard where CSV downloads break due to
character encoding issues.
2013-12-20 15:05:50 -05:00
Calen Pennington
8e98c8cbb7 Merge pull request #2015 from cpennington/image-response-acceptance-tests
Add acceptance test of image response
2013-12-20 11:03:15 -08:00
Calen Pennington
32fa35c8f4 Merge pull request #2007 from cpennington/gst-acceptance-tests
Add acceptance tests of GST module
2013-12-20 11:01:27 -08:00
Calen Pennington
3bb67a8b0e Merge pull request #1996 from cpennington/conditional-module-acceptance-tests
Add acceptance tests of the conditional module
2013-12-20 11:01:07 -08:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests
Add acceptance tests of Annotatable module
2013-12-20 11:00:41 -08:00
Brian Talbot
6d6bcb7938 Merge pull request #1968 from edx/talbs/lms-fonts
LMS: Use Open Sans Typeface via Google Web Fonts
2013-12-20 10:21:41 -08:00
Ned Batchelder
dfb04bc4c9 Merge pull request #2017 from edx/ned/i18n-minor-improvements
Minor i18n improvements
2013-12-20 10:03:06 -08:00
Calen Pennington
194e0e973f Add acceptance tests of capa image input 2013-12-20 12:32:15 -05:00
Calen Pennington
0e237a85e6 Add acceptance test of the Graphical Slider Tool [LMS-1641] 2013-12-20 12:32:15 -05:00
Calen Pennington
268c4fa01b Add acceptance tests of the conditional module [LMS-1639] 2013-12-20 12:32:15 -05:00
Calen Pennington
a9a8dcf882 Allow acceptance test problem functions to work without hardcoded course name 2013-12-20 12:32:15 -05:00
Calen Pennington
7e91ba63ab Add acceptance tests of the annotatable module [LMS-1638] 2013-12-20 12:32:14 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05:00
Ned Batchelder
c0c895cb47 Merge pull request #1886 from edx/ned/add-tests-for-file-uploads
Add a test for Django-based file uploads to problems.
2013-12-20 07:06:04 -08:00
Calen Pennington
7f76517ea3 Cleanup courseware acceptance tests 2013-12-20 09:29:23 -05:00
Sarina Canelake
f330b1e65f Tweak language surrounding grade download button 2013-12-19 18:16:07 -08:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
2013-12-18 13:38:36 -05:00