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

935 Commits

Author SHA1 Message Date
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
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
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
Lyla Fischer
094382d588 added solutions and basic metadata to templates 2012-10-17 14:30:31 -04:00
Victor Shnayder
38bd83858b Make problemset render as a sequential, not a vertical. 
- Piotr requested this.  Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
 2012-10-15 12:52:21 -04:00
ichuang
557b79129b added image, solution, showhide examples to latex_problem template; 
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
 2012-10-14 23:26:46 -04:00
ichuang
a8cbcca9ab fix HTML display of math (it wasn't queueing mathjax) 2012-10-14 22:14:51 -04:00
ichuang
50f665311e update latex template problem; add template adaptive hint problem 2012-10-14 21:28:25 -04:00
ichuang
8742ba76a3 improved latex problem template; hls codemirror box autosizes height; 
capa responsetypes can now include "inline='1'" for their span to be inline
 2012-10-14 20:19:14 -04:00
ichuang
92f329ca1a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-14 16:36:40 -04:00
Chris Dodge
d34075ff89 remove the — from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev 2012-10-14 15:43:16 -04:00
Victor Shnayder
4594d37bf2 Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug 
reset_problem in capa_module should always return dicts not strings
 2012-10-14 10:36:49 -07:00