Commit Graph

5627 Commits

Author SHA1 Message Date
Valera Rozuvan
cf47f522c0 Fix Firefox YouTube default Flash mode
BLD-895
2014-03-11 10:47:47 +00:00
Calen Pennington
31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-03-10 16:21:08 -04:00
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
ichuang
171650d253 Merge pull request #2870 from edx/bugfix/ichuang/capa-display-status
fix capa textline display to leave "inline" alone upon status change
2014-03-10 10:47:47 -04:00
ichuang
c543dbb695 Merge pull request #2869 from edx/bugfix/ichuang/textline-inline-for-jspre
fix capa textline to properly use inline if specified when using math preprocessor
2014-03-10 10:47:01 -04:00
ichuang
cac669364f more robust capa math preprocessor test, and new test for inline 2014-03-10 09:52:25 -04:00
jmclaus
76de7f6055 Merge pull request #2855 from edx/anton/fix-fullscreen-in-flash
Fix video resizing in Flash mode.
2014-03-10 14:08:18 +01:00
Usman Khalid
d335713da5 Export CourseDescriptor wiki_slug field to xml.
LMS-2136
2014-03-10 16:13:18 +05:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it.
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
2014-03-10 16:13:18 +05:00
Usman Khalid
3c55c91c5a Added get_courses_for_wiki(self, wiki_slug) to mongo, xml and mixed modulestores.
This method returns a list of courses which use the particular wiki_slug. It is used for
checking permissions in the course_wiki app.

LMS-2136
2014-03-10 16:13:17 +05:00
Don Mitchell
98c66d9035 Added get_courses_for_wiki method.
LMS-2136
2014-03-10 16:13:17 +05:00
polesye
07ed368505 BLD-905: Fix video resizing in Flash mode. 2014-03-09 12:36:17 +02:00
ichuang
a35d524de2 fix text-input-dynamath_data test in test_input_templates.py 2014-03-07 22:14:22 -05:00
ichuang
eb1cc23ca5 fix capa textline display to leave "inline" alone upon status change 2014-03-07 21:45:50 -05:00
ichuang
8d0db64f78 fix capa textline to properly use inline if specified when using js preprocessor 2014-03-07 20:08:37 -05:00
Sarina Canelake
2da9042cc6 Merge pull request #2863 from edx/sarina/violations
Fix some simple pep8 and pylint violations
2014-03-07 17:27:05 -05:00
Han Su Kim
f42d42d1f8 Merge branch 'master' into release
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-03-07 14:39:09 -05:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Sarina Canelake
87495891b6 Fix some simple pep8 and pylint violations 2014-03-07 12:20:28 -05:00
Calen Pennington
5f2de7653f 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-07 11:06:06 -05:00
polesye
fe8e6026a1 BLD-852: Fix video positioning in full view mode. 2014-03-07 15:17:39 +02:00
polesye
65adb7b272 BLD-896: Fix cc button in HTML5 videos. 2014-03-07 11:24:30 +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
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
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
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
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