Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,600 Commits 1 Branch 0 Tags
0a79b30ec40e14a664fad73e17c98b6ea85f0efc
Commit Graph

21600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Calen Pennington
760027bd2a Normalize the representation of Scope.content data in MongoModulestore FieldData 
Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
 2014-03-10 12:01:57 -04:00
Xavier Antoviaque
73f75f23bb Update import location of prefer_xmodules 2014-03-10 12:01:56 -04:00
Xavier Antoviaque
c3ae0306f1 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-10 12:01:56 -04:00
Han Su Kim
d2c147bfc4 Merge pull request #2824 from cpennington/rc-ab-tests 
A/B Test Module
 2014-03-05 14:38:10 -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
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
Dave St.Germain
72e876fe40 Prevent reflected XSS in instructor dashboard. 2014-03-05 11:45:45 -05:00
Han Su Kim
cd42c91726 Merge pull request #2818 from edx/alex/allow_html_in_grader_msg 
Allow HTML in grader messages.
 2014-03-05 11:25:31 -05:00
Han Su Kim
5e14d045b6 Merge pull request #2814 from gsehub/xblock-mentoring 
xblock-mentoring: Add repository to requirements & installed apps
 2014-03-05 11:22:05 -05:00
Xavier Antoviaque
0864d57588 Activate XBlocks by default in LMS & Studio 2014-03-05 12:19:27 -04:00
Xavier Antoviaque
3856257e80 xblock-mentoring: Add repository to requirements & installed apps 
Adding to installed Django applications is required due to the use
of a Django model by the XBlock
 2014-03-05 12:19:24 -04:00
Alexander Kryklia
c7785d8f54 Allow HTML in grader messages. 2014-03-05 17:24:55 +02:00
Han Su Kim
b0a4cc7aaf Merge pull request #2817 from edx/jarv/update-js-draw-commit 
updating commit
 2014-03-05 10:23:15 -05:00
John Jarvis
955950164a updating commit 2014-03-05 10:21:46 -05:00
Han Su Kim
8e4b924bfc Merge pull request #2806 from edx/frances/fix/lms-modal-button 
making LMS modal buttons more flexible to handle longer strings in trans...
 2014-03-04 11:07:00 -05:00
Han Su Kim
5ddab10065 Merge pull request #2805 from edx/gprice/comment-edit-button-key-activation 
Make forum comment buttons activate by keyboard
 2014-03-04 11:06:44 -05:00
Frances Botsford
68a679b351 making LMS modal buttons more flexible to handle longer strings in translation, eg. French 2014-03-04 11:02:55 -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
marcotuts
9360760376 Merge pull request #2794 from edx/marco/bug-fix/html-xmodule 
bug fix for HTML xmodule styling which caused first line of text to be c...
 2014-03-03 11:43:52 -05:00
marco
17e95f184a bug fix for HTML xmodule styling which caused first line of text to be cut off. STUD-1380 2014-03-03 11:18:57 -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
Sarina Canelake
5f581958f8 Merge pull request #2790 from edx/sarina/030314-language-update 
Update translations (autogenerated message)
 2014-03-03 10:27:33 -05:00
Sarina Canelake
5fc53402ab Update translations (autogenerated message) 2014-03-03 10:25:39 -05:00
marcotuts
975c3e612e Merge pull request #2760 from edx/marco/bulk-email/images 
adding in gray versions of social icons for use in new email template. U...
 2014-03-03 10:20:30 -05:00
Gabe Mulley
0a7ecea623 Merge pull request #2721 from rocha/rocha/add-answer-values 
Add map to problem_check event with descriptions of student answers
 2014-03-03 10:19:23 -05:00
Jay Zoldak
82d48b5ab3 Import BrokenPromise 2014-03-03 10:16:04 -05:00
Sarina Canelake
f74a0f4f55 Merge pull request #2782 from edx/sarina/030314-language-update 
Update translations (autogenerated message)
 2014-03-02 22:38:09 -05:00
Sarina Canelake
341bc150fb Update translations (autogenerated message) 2014-03-02 22:34:06 -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
chrisndodge
c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup 
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
 2014-02-28 17:38:19 -05:00
David Adams
52b8d0c0f0 Merge pull request #2346 from edx/dcadams/student_metrics_tab 
New tab (Metrics) in instructor dashboard
 2014-02-28 14:26:56 -08:00
Kristin Stephens
3881ffdc0d New tab (Metrics) in instructor dashboard 
Metrics tab shows student data:
  -Count of students opened a subsection
  -Grade distribution per problem

for each section/subsection of the course.

Implemented for both the old and beta dashboard
Controlled by a feature flag 'CLASS_DASHBOARD'
Data is aggregated across all students
Aggregate data computed from courseware_studentmodule
 2014-02-28 14:01:44 -08:00
srpearce
9a23be5379 Merge pull request #2769 from edx/sylvia/documentation/STUD-1293 
Sylvia/documentation/stud 1293
 2014-02-28 16:36:31 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Sylvia Pearce
19707d2776 Edits to polls and problem randomization 2014-02-28 16:18:11 -05:00
Adam
f400f1a6a3 Merge pull request #2773 from edx/release 
Release
 2014-02-28 16:03:11 -05:00
chrisndodge
a5132493ff Merge pull request #2716 from edx/cdodge/prevent-clickjacking 
allow the prevention of the LMS/CMS from being renderable in an iframe
 2014-02-28 15:57:51 -05:00
Han Su Kim
6d3c62b237 Merge pull request #2766 from edx/han/Vagrantfile 
Removing Vagrantfile, no longer used, please see configuration repo
 2014-02-28 15:56:28 -05:00
marco
01971c6c2f adjusted color of russian social network image to be a lighter gray 2014-02-28 15:48:18 -05:00
Adam
aa2949f1ed Merge pull request #2772 from edx/ned/install-jsdraw 
Ned/install jsdraw
 2014-02-28 15:28:27 -05:00
Han Su Kim
9bccb3e45c also delete two files associated with Vagrantfile in edx-platform 2014-02-28 15:03:06 -05:00
Chris Dodge
fce30825df allow the prevention of the LMS/CMS from being renderable in an iframe 2014-02-28 14:21:07 -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
Adam Palay
db90cd7985 update js_draw req 2014-02-28 13:53:29 -05:00