Commit Graph

667 Commits

Author SHA1 Message Date
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
2014-05-02 14:34:21 -07:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Nick Parlante
ab7d3b526b Multiple-choice features
Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)
2014-04-14 15:48:29 -07:00
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks
Temporarily disable CAPA problem "Check" button.
2014-04-10 11:37:52 -04:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768).
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
2014-04-08 13:03:22 +03:00
Graham Lowe
5e0849d214 Temporarily disable CAPA problem "Check" button.
- update appropriate jasmine tests so that stubbed $postWithPrefix
respects a subset of jQuery promise API.
- add customization for checking state.
- display checking state while button is disabled.
- ensure checking state lasts for at least a second.
2014-04-07 13:17:43 -04:00
Julia Hansbrough
aa41635f79 XModule datadog metrics 2014-04-03 18:31:44 +00:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page.
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed
html from getting onto the page. The client will then unescape the html
and display it.
2014-03-24 13:28:08 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
David Baumgold
c4b81111f2 Merge pull request #2963 from louyihua/master
Fix incorrect parse of url in video_module.py
2014-03-21 10:50:40 -04:00
louyihua
d76c3dfc36 Fix the url processing error when there is a query string inside the video source's url
1. In video_module.py, rewrite the get_ext() function to use the built-in urlparse module to parse the input filename first and then get the file's extension name from the parsed path.
2. In test_video.py, add two test cases (one with query string while the other without) in order to test the rewritten get_ext() function.
2014-03-21 22:47:00 +08:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Diana Huang
6f7c73cd4f Fix split_test import and export.
LMS-2405
2014-03-18 14:15:13 -04:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language.
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
2014-03-14 18:30:42 +02:00
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router
Dbarch/mixed ms router
2014-03-05 17:17:07 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD
STUD-600
2014-03-05 14:32:56 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS.
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
2014-03-05 13:45:08 -05:00
Gabe Mulley
94fea8e822 Add map to problem_check event with descriptions of student answers
The map contains a human readable description of the answer if
necessary. It is useful for problem like multiple choice, when the
response of the student is replaced by a moniker. For example "choice_0"
instead of the full text.

Fixes: AN-587
2014-03-02 21:40:45 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release'
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-02-27 17:33:40 -05:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment.
ORA-330
2014-02-27 10:38:34 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test
Add tests of local_resource_url
2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Adam
c9a4de607d Merge pull request #2694 from edx/adam/announcement-text
minor change to html in announcement unit (STUD-1334)
2014-02-24 15:55:14 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Adam Palay
2e58e80a68 minor change to html in announcement unit (STUD-1334) 2014-02-24 10:34:44 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Christina Roberts
89ac19e81f Merge pull request #2503 from edx/christina/conditional
Conditional module changes to support Locator/Location conversion.
2014-02-12 15:03:29 -05:00
cahrens
276c6e918e Store locations in ReferenceLists so they can be converted to locators.
STUD-1027
2014-02-12 14:08:24 -05:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc
Video: Revert Download transcript button behavior.
2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Ned Batchelder
aab6c54a51 Merge pull request #2545 from edx/ned/remove-tabs
Remove tabs.
2014-02-10 15:54:11 -05:00
Ned Batchelder
2f67d0aab4 Remove tabs. 2014-02-10 15:13:11 -05:00
Calen Pennington
64008200f3 Fix pylint violations 2014-02-10 13:34:25 -05:00
Calen Pennington
e0f6b1a24a Merge pull request #2221 from cpennington/xblock-xml-serialization
Enable (and test) xml export of pure XBlocks
2014-02-07 16:46:46 -05:00
Calen Pennington
db17bf4c15 Add tests of XML exporting to test_xblock_wrappers 2014-02-07 15:50:34 -05:00
David Baumgold
e09990ff30 Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files
Skip tilde files when importing
2014-02-07 15:42:02 -05:00
David Baumgold
d1dc8c9191 Add README to tilde fixture, fix pylint/pep8 issues 2014-02-07 15:03:37 -05:00