Commit Graph

4136 Commits

Author SHA1 Message Date
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript
Allows students to download the transcript of the video without timecodes
2014-01-22 12:03:41 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images
Fix non-ascii course image names
2014-01-22 07:50:13 -08:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore
[LMS-2073]
[STUD-1197]
2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
2014-01-22 07:16:30 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting
one more faulty login regarding ENABLE_MKTG_SITE=true situations
2014-01-16 17:04:17 -05:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
2014-01-14 13:28:47 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Sarina Canelake
129c24477f Merge pull request #2062 from jazkarta/feature-idde2
Individual Due Date Extension feature
2014-01-14 08:00:14 -08:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Sarina Canelake
9ce10493ad Remove references to old university images 2014-01-14 09:27:03 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag
[LMS-226]
[LMS-2013]
2014-01-10 11:40:03 -05:00
Calen Pennington
a6a004314a Use block type, rather than class names for StudentPreference field storage in LMS 2014-01-09 15:59:16 -05:00
Ned Batchelder
d138a2c6be Use Django for runtime i18n
The django.utils.translation module has the right interface to serve as a
gettext.Translations object, so we use it for the runtime i18n service.

LMS-1597
2014-01-09 14:19:56 -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
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02: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
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
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
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
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
Alexander Kryklia
946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending
Make LTI module not send grade_back_url if has_score=False
2013-12-17 08:14:42 -08:00
Carson Gee
149a188e30 Merge pull request #1547 from carsongee/bugfix/cg/beta_user_none
Corrects a bug experienced with external auth enabled
2013-12-17 07:55:59 -08:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
Jay Zoldak
7add01462d Merge pull request #1969 from edx/zoldak/fix-test-name
Remove dot from a scenario name so the results roll up in Jenkins
2013-12-17 05:48:35 -08:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url.
BLD-564.
2013-12-17 12:47:49 +02:00
Jay Zoldak
599388397a Remove dot from a scenario name so the results roll up in Jenkins 2013-12-16 17:07:26 -05:00