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

7735 Commits

Author SHA1 Message Date
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Han Su Kim
bf754c867b Merge pull request #2848 from antoviaque/xblock-mentoring-optionalapp-fix 
Only add mentoring application to INSTALLED_APPS when in virtualenv
 2014-03-06 18:26:11 -05:00
Xavier Antoviaque
76ae57c7ec Update import location of prefer_xmodules 2014-03-06 18:49:39 -04:00
Carson Gee
b3ac3b6f4d Merge pull request #2283 from carsongee/cg/feature/git_branch_import 
Add option for importing a course from a named branch of a git repo
 2014-03-06 17:38:34 -05:00
Carson Gee
b67b89e562 Fixed bug of checking out the same branch multiple times and code review fixes 
Translator comments and language fixes
 2014-03-06 17:30:07 -05:00
Xavier Antoviaque
62628f6bd2 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-06 18:23:33 -04:00
Han Su Kim
0db4a899f4 Merge branch 'release' 2014-03-06 16:57:06 -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
Carson Gee
9d55c88c76 Add option for importing a course from a named branch of a git repo 2014-03-06 16:26:25 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes 
Correct misaligned django-cas integration
 2014-03-06 16:17:13 -05:00
Ned Batchelder
9425974b40 Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix 
Fix unicode issue in shopping cart
 2014-03-06 14:16:53 -05:00
Bertrand Marron
01c5cd5dc4 Fix unicode issue in shopping cart 
Fails when course name contains non-ascii characters.
 2014-03-06 11:46:53 +01:00
David Adams
dcb169fb37 Moved CLASS_DASHBOARD setting into the FEATURES dict. 2014-03-05 15:47:23 -08: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
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -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
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
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
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
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
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
Jason Bau
35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache 
Move FieldDataCache assert to check both get and get_or_create
 2014-03-03 12:08:09 -08:00
Greg Price
db8ad0d20b Add bok choy tests for forum comment editing 2014-03-03 14:26:25 -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
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
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
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Adam
f400f1a6a3 Merge pull request #2773 from edx/release 
Release
 2014-02-28 16:03:11 -05:00
marco
01971c6c2f adjusted color of russian social network image to be a lighter gray 2014-02-28 15:48:18 -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
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
Ned Batchelder
0fd59939e2 Add JSdraw to INSTALLED_APPS if we can. 2014-02-28 11:24:11 -05:00
Jason Bau
a160428b9b Move FieldDataCache assert to check both get and get_or_create 2014-02-27 20:06:16 -08:00
marco
1906946db9 adding in gray versions of social icons for use in new email template. Using new name to ensure old links and existing emails using older templates still stay active 2014-02-27 17:33: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
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
Frances Botsford
25833471d4 adding a little styling to the language note on the LMS help modal 2014-02-27 15:32:56 -05:00