Commit Graph

11117 Commits

Author SHA1 Message Date
Don Mitchell
371ecb08e8 Better sorting of stores for get_courses
May apply to all store ordering
2014-03-05 14:40:34 -05:00
Don Mitchell
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -05:00
Don Mitchell
c9285de433 unicode correctly and understandably 2014-03-05 14:40:33 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -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
David Adams
d45251164e Fixes tinymce bug:
On using the image plugin, the image was not appearing in the
    visual editor immediately after using the command.

    Selenium test added.
2014-03-05 11:30:32 -08:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Calen Pennington
2d5c37b2a0 Track renders of split_test children
[LMS-2098]
2014-03-05 13:45:08 -05:00
Calen Pennington
d101933617 Add course tags to all events where a course-id can be extracted from the url
[LMS-2105]
2014-03-05 13:45:08 -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
Alexander Kryklia
c7785d8f54 Allow HTML in grader messages. 2014-03-05 17:24:55 +02:00
Alexander Kryklia
6772faa0a5 Merge pull request #2796 from edx/alex/no_default_subs_en
Catch exception if for en no default subs is uploaded.
2014-03-05 16:49:54 +02:00
Ned Batchelder
f5eb5286a2 Merge pull request #2802 from ionis-education-group/gender-education-translation
Translate gender and education level from user profile
2014-03-05 07:35:54 -05:00
Greg Price
b4caf75cbb Make forum comment buttons activate by keyboard
Neither edit nor delete activated on pressing the space key.
2014-03-04 10:42:07 -05:00
Bertrand Marron
10688f99f4 Add translator comments for 'other' and 'none' strings 2014-03-04 16:40:27 +01:00
Dave St.Germain
92411bd291 Merge pull request #2754 from edx/dcs/a11y-shorter-titles
Display only the first component name in the page (and nav) title.
2014-03-04 10:05:52 -05:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05:00
Alexander Kryklia
ccb776e928 Catch exception if for en no default subs is uploaded. 2014-03-04 15:41:46 +02:00
Bertrand Marron
6cb458b46a Translate gender and education level from user profile 2014-03-04 11:22:32 +01:00
Dave St.Germain
601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader
Upgrade CodeMirror to 3.21.0
2014-03-03 17:57:46 -05:00
Greg Price
1d2175dce0 Merge pull request #2774 from edx/gprice/edit-forum-comment-bok-choy
Add bok choy tests for forum comment editing
2014-03-03 15:37:05 -05:00
Greg Price
db8ad0d20b Add bok choy tests for forum comment editing 2014-03-03 14:26:25 -05:00
Usman Khalid
c0caca74a7 Merge pull request #2784 from edx/usman/lms2205-progress-page-inconsistency
Increases precision of percentages shown in 'Total' bar on progress page
2014-03-03 22:16:08 +05:00
Sarina Canelake
3802e8f539 Merge pull request #2779 from edx/sarina/embargo-logging
Add logging to embargo middleware
2014-03-03 10:59:37 -05:00
Jay Zoldak
030004bcef Merge pull request #2789 from edx/zoldak/fix-ora-test
Import BrokenPromise
2014-03-03 10:54:40 -05:00
Jay Zoldak
82d48b5ab3 Import BrokenPromise 2014-03-03 10:16:04 -05:00
Usman Khalid
5e1751c346 Increases precision of percentages shown in 'Total' bar on the progress page.
The percentages shown currently can be confusing. For example, if the true weight
of a category is 0.76925% and the student scores 100% in it, they will see '0.8%
out of a possible 1.0%'. Increasing the precision to 2 decimal places changes it
to '0.77% of a possible 0.77%'.

LMS-2205
2014-03-03 19:03:47 +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
Sarina Canelake
f79cefe19a Add logging to embargo middleware 2014-03-02 18:27:18 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Dave St.Germain
a1dc347c1a Merge pull request #2767 from edx/dcs/a11y-forgot-a-label
Add label to the checkboxes sample template.
2014-02-28 14:19:16 -05:00
chrisndodge
38916f8528 Merge pull request #2713 from edx/cdodge/add-auth-to-wiki
add some authorization checks to the Wiki
2014-02-28 14:15:59 -05:00
Dave St.Germain
08fadac817 Upgrade CodeMirror to 3.21.0 (with accessibility changes from
http://bgrins.github.io/codemirror-accessible/)
LMS-1802
2014-02-28 13:44:34 -05:00
Chris Dodge
10465e3eb0 add some authorization checks to the Wiki 2014-02-28 13:36:18 -05:00
Dave St.Germain
fd59de346b Converted javascript confirmation dialog to jquery UI dialog (needs style) 2014-02-28 13:32:39 -05:00
Dave St.Germain
9826a2f19e Add label to the checkboxes sample template. 2014-02-28 11:25:42 -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
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Calen Pennington
287d84ba95 Fix youtube captions that disappeared with multi-language caption support
[BLD-889]
2014-02-27 15:42:19 -05:00
Andy Armstrong
9cee08ea88 Merge pull request #2539 from edx/andya/nested-xblocks
Add new container page that can display nested xblocks
2014-02-27 15:29:57 -05:00
Dave St.Germain
155ed8c665 Display only the first component name in the page (and nav) title.
STUD-1351
2014-02-27 15:29:23 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
2014-02-27 14:53:05 -05:00
chrisndodge
7884e49955 Merge pull request #2711 from edx/cdodge/throttle-forgot-password
add some rate limiting to the password reset functionality
2014-02-27 14:47:21 -05:00
Chris Dodge
46fa943fc2 fix method name to actually make sense 2014-02-27 13:56:58 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save
Native XBlock Studio Save UI
2014-02-27 10:50:51 -05:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment.
ORA-330
2014-02-27 10:38:34 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database
Finalize tests for embargo middleware app
2014-02-27 10:27:29 -05:00
Sarina Canelake
e71bbeb1e2 Tests for embargo middleware feature 2014-02-27 09:33:17 -05:00
Sarina Canelake
fe85a1eec1 Django-admin for Embargo feature
Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.
2014-02-27 08:38:05 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
2014-02-27 08:37:58 -05:00