Calen Pennington
171e932266
Merge branch 'master' into feature/cale/cms-master
...
Conflicts:
rakefile
2012-11-08 12:28:40 -05:00
Calen Pennington
3230345204
Make coverage reports only include code from the source directories
2012-11-08 12:25:12 -05:00
Ned Batchelder
28bb4724e7
Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.
2012-11-08 11:20:23 -05:00
Ned Batchelder
3dc23eb131
Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'.
2012-11-08 11:20:22 -05:00
Ned Batchelder
90e3386751
WIP for quieter tests with coverage.
2012-11-08 11:19:33 -05:00
Carlos Andrés Rocha
25d482099e
Merge pull request #955 from MITx/louis/srt_downloads
...
Add support for subtitle download link
2012-11-07 15:31:02 -08:00
Chris Dodge
87ff18dc56
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-11-07 09:35:21 -05:00
Carlos Andrés Rocha
07da271747
Merge pull request #1022 from MITx/ie8patch
...
revert to using getElementsByClassName in .dialog b/c jQuery was
2012-11-06 14:14:07 -08:00
Don Mitchell
ce623bcf17
revert to using getElementsByClassName in .dialog b/c jQuery was
...
undefined on the content passed in & whole widget is disabled in ie8.
2012-11-06 17:05:44 -05:00
Calen Pennington
bca0134a35
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
...
Conflicts:
lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55
Merge pull request #1008 from MITx/ie8patch
...
merge to master
2012-11-06 06:18:01 -08:00
Victor Shnayder
55a0cada7b
Fix a bug with pointer-tag detection on load
...
if a tag has text but no children, wasn't properly detected as an inline definition.
2012-11-02 16:59:41 -04:00
Calen Pennington
e35d1483c6
Merge pull request #1009 from MITx/bug/lyla/latextemplate
...
fixed typo
2012-11-02 13:38:40 -07:00
Don Mitchell
8089be3354
Minor stylistic change on jQuery pattern.
2012-11-02 15:31:02 -04:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
Lyla Fischer
8ed4ef4412
fixed typo
2012-11-01 11:36:41 -04:00
David Ormsbee
ddc4f705e0
Remove raise that was there just for debugging purposes
2012-11-01 04:50:23 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
Chris Dodge
17528906ab
make sure paths are path() objects rather than strings so that the '/' operator works as expected. Also some path cleanup and remove duplicate computation
2012-10-31 22:16:11 -04:00
Victor Shnayder
e4c49f3a1e
Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor
...
Feature/victor/inputtypes refactor
2012-10-31 15:18:28 -07:00
Don Mitchell
2b5e55b662
Use try/catch to detect undefined globals for canvas
2012-10-31 17:29:19 -04:00
Don Mitchell
6bbe82b697
Make work w/ ie8. Still complains that HTMLCanvasElement is undefined
...
but doesn't try to manipulate it.
2012-10-31 17:05:46 -04:00
Chris Dodge
87dadd40c4
address some of Cale's feedback
2012-10-31 14:11:24 -04:00
Carlos Andrés Rocha
e5b11a9c57
Add HD control to video player
2012-10-30 19:21:17 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
David Ormsbee
535980eb6d
Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired.
2012-10-30 11:06:50 -04:00
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Arjun Singh
75f0a56d70
Change documentation, make values strings for save button forcing
2012-10-28 21:57:28 -07:00
Arjun Singh
e29d244a8f
allow saving nonrandomized problems
2012-10-28 21:47:43 -07:00
kimth
98c3d861ad
Fix reference to iidiv
2012-10-27 18:19:56 +00:00
Chris Dodge
90f9d5fcf0
fix grading policy filepath generation
2012-10-26 15:18:56 -04:00
kimth
62840765a5
Variable name is misleading, use generic 'answer' instead
2012-10-26 06:59:21 +00:00
kimth
84aeb9dad3
Permit collapsibles in capa detailed solution
2012-10-26 06:01:26 +00:00
Chris Dodge
b7c830a861
use existing _replace() method on Location to do the re-namespacing on import
2012-10-25 16:37:31 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Chris Dodge
606e2dba15
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-10-24 20:57:08 -04:00
Chris Dodge
fec6c42adc
implement importing of course info sections as modules in the course
2012-10-24 20:55:04 -04:00
Victor Shnayder
16990c2743
Add an end date to courses.
...
- needed for cert generation (and later lots of other things)
2012-10-24 17:23:13 -04:00
Calen Pennington
bacd728efc
Squelch some (but not all, yet) errors during template loading
2012-10-24 16:25:20 -04:00
Calen Pennington
f970da6da2
Fix issue where import didn't work if no grading policy file existed
2012-10-24 15:51:43 -04:00
Chris Dodge
ae4df32e43
adjust implemented according to code review feedback. Move all of the grading_policy retrieval into a from_xml() override method. Also move in some of the grading inheritance logic into course_module.py
2012-10-24 12:27:30 -04:00
Chris Dodge
d2c46f51ea
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy
2012-10-23 23:56:02 -04:00
Chris Dodge
91e50f13cb
implement importing of grading policy during import. This is stored in definition.data.grading_policy.
2012-10-23 23:55:55 -04:00
Louis Sobel
b1cfee4592
Add support for subtitle download link
...
Add a download link to the video player. The link is defined
in the content xml using the following structure:
<video youtube="youtubestring">
<track kind="subtitle" src="subtitle_link" />
</video>
2012-10-23 14:50:17 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Chris Dodge
1530341d55
have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder.
2012-10-22 16:01:57 -04:00
