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

7681 Commits

Author SHA1 Message Date
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
zubair-arbi
06c0aa530a Merge pull request #2803 from edx/zub/bugfix/std1248-handoutlocmapp 
add location of handouts in loc_mapper
 2014-03-06 16:43:15 +05:00
Valera Rozuvan
b4c8e63f9f Merge pull request #2744 from edx/valera/move_slider_and_vcr_to_start_time_2 
Show start time or starting position on slider and VCR
 2014-03-06 13:42:40 +02:00
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05:00
Valera Rozuvan
b85130bb29 Show start time or starting position on slider and VCR. 
When the start time is set, or a initial position is
set,the VCR timer and the time slider should jump to
correct starting point before the video starts playing.

BLD-823
 2014-03-06 12:33:22 +02:00
zubiar-arbi
84a70279f6 properly set tinymce editor startContent 
STUD-1336
 2014-03-06 15:09:04 +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
cahrens
4ec669c855 Slightly reorder the toolbar buttons so that the image button is more likely to be visible. 
Hopefully we will get a better solution with the TinyMCE upgrade PR.
 2014-03-05 15:44:51 -05:00
Don Mitchell
41f5159b37 Test special code paths in create_item 2014-03-05 14:40:35 -05:00
Don Mitchell
71ac844120 Add tests for get_orphans 2014-03-05 14:40:35 -05:00
Don Mitchell
e972b23064 Requesting an xmodule field in wrong app context raises exception rather than assertion 2014-03-05 14:40:35 -05:00
Don Mitchell
563b713a3f Test exception on read-only db 2014-03-05 14:40:35 -05:00
Don Mitchell
aecc037e2d pylint and pep8 fixes 2014-03-05 14:40:35 -05:00
Don Mitchell
fc1ca7b3a2 No longer create loc maps on create_(item|course) 2014-03-05 14:40:35 -05:00
Don Mitchell
dcc6f54409 Change get_courses default branch to draft. 
We need to figure out how apps configure what default they want or ensure they get the one they want
 2014-03-05 14:40:34 -05:00
Don Mitchell
aab5e0441b Mixed modulestore handles most modulestore functions, cont. 2014-03-05 14:40:34 -05:00
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
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