Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
eab5bd4c3e fix preview draft link. We need to generate the link target url directly rather than using jump_to. I think jump_to is not properly finding the draft objects and needs more investigation 2012-10-14 23:38:43 -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
chrisndodge
a45861e290 Merge pull request #904 from MITx/fix/cdodge/cas-tab-fixes 
always hide the pages button. We don't want it appearing in case someone...
 2012-10-14 19:47:07 -07:00
Chris Dodge
6fc07ab45e always hide the pages button. We don't want it appearing in case someone types a 'w' 2012-10-14 22:42:36 -04:00
ichuang
a8cbcca9ab fix HTML display of math (it wasn't queueing mathjax) 2012-10-14 22:14:51 -04:00
chrisndodge
5931a8d9bc Merge pull request #903 from MITx/fix/cdodge/broken-path-to-view-subsection 
when calling jump_to when location=<id-of-sequential> then Position is b...
 2012-10-14 18:33:43 -07:00
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -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
Carlos Andrés Rocha
0f16e8a358 Return only username on OpenID provider requests. 
Temporarily return username also as the email and fullname fields of
the response using OpenID's simple registration extension.
 2012-10-14 19:45:22 -04:00
ichuang
12869ecedd fix hls modal window style (it now autosizes properly) 2012-10-14 17:48:45 -04:00
ichuang
69bfdac49f minor change in dev_ike for cms-master 2012-10-14 16:58:11 -04:00
ichuang
09d7d6d688 add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut 2012-10-14 16:40:04 -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
chrisndodge
f4b61e8f47 Merge pull request #901 from MITx/fix/cdodge/multiple-choice 
remove the &mdash; from the HTML, this apparently is causing the CAS and...
 2012-10-14 12:44:49 -07:00
Chris Dodge
d34075ff89 remove the &mdash; 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
ichuang
3c8830f3b0 reset_problem in capa_module should always return dicts not strings 
this is for the master branch (versus cms-master)
 2012-10-14 12:57:58 -04:00
Victor Shnayder
15d4af26a5 Merge pull request #899 from MITx/feature/victor/capa-ajax 
Make chem preview more robust
 2012-10-14 08:40:39 -07:00
Victor Shnayder
f4d8df94dd Make chem preview more robust 
- give the preview div an id, use that to look it up instead of dancing around in the DOM
 2012-10-14 11:35:32 -04:00
Piotr Mitros
97233cf00e Work-around for bug in pip lookup 2012-10-14 10:33:11 -04:00
chrisndodge
f845cc4e08 Merge pull request #898 from MITx/fix/cdodge/multiple-choice 
remove HTML comment from schematiceditor template
 2012-10-13 20:44:06 -07:00
Chris Dodge
8f1336d87a remove HTML comment from schematiceditor template 2012-10-13 23:27:37 -04:00
David Ormsbee
1154c4b897 auto-resend activation email if they try to log in and aren't activated 2012-10-13 23:20:33 -04:00
ichuang
db8f69d497 fix tabs in latex_html.yaml template 2012-10-13 23:10:51 -04:00
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -04:00
chrisndodge
bdbeec9ad5 Merge pull request #895 from MITx/fix/cdodge/multiple-choice 
fix exception in LMS when rendering newly create multiple choice problem...
 2012-10-13 19:21:21 -07:00
Chris Dodge
444d4b1054 fix exception in LMS when rendering newly create multiple choice problems. The capa module is barfing on the HTML comment which was in there and the XML parser couldn't handle it. 2012-10-13 22:19:48 -04:00
chrisndodge
1b4f569c08 Merge pull request #894 from MITx/fix/cdodge/cas-bugs 
Fix/cdodge/cas bugs
 2012-10-13 18:53:48 -07:00
Chris Dodge
13e23cbbab Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs 
Conflicts:
	cms/templates/widgets/header.html
 2012-10-13 21:49:05 -04:00
chrisndodge
91fe7da44a Merge pull request #883 from MITx/fix/cale/edge-bugs 
Fix/cale/edge bugs
 2012-10-13 18:46:05 -07:00
Chris Dodge
ebf6d74776 Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs 
Conflicts:
	cms/static/js/base.js
 2012-10-13 21:44:15 -04:00
Chris Dodge
258a467fa6 make delete unit delete both the draft and non-draft versions 2012-10-13 20:55:49 -04:00
arjun810
1ec0fae801 Merge pull request #891 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax
 2012-10-13 17:05:44 -07:00
arjun810
ccc5e5771d Merge pull request #893 from MITx/kimth/toggle-stay-in-place 
Toggle shouldn't follow anchor
 2012-10-13 16:01:58 -07:00
Chris Dodge
271fa6956a save_item should also do proper 'is this element draft aware' logic so that incorrect versioning occurs on elements which do not support versioning at this point in time (aka courses, sections, and subsections). 2012-10-13 18:53:32 -04:00
Chris Dodge
cbc619f8af hack patch to at least keep the unit.html page from blowing up 2012-10-13 16:09:33 -04:00
Chris Dodge
2e43d2ebcc don't display a broken thumbnail image if a thumbnail is not available 2012-10-13 15:43:50 -04:00
kimth
113e8b97b6 Toggle shouldn't follow anchor 2012-10-13 16:19:54 +00:00
Chris Dodge
f1517fefa6 hide search button on asset index page 2012-10-13 10:45:52 -04:00
Chris Dodge
8151b1030f remove wip on Import header button 2012-10-13 10:42:49 -04:00
arjun810
a46c517a9d Merge pull request #892 from MITx/kimth/fix-mc-soln-conflict 
choicegroup should only process choices belonging to its input_id
 2012-10-12 23:27:19 -07:00
kimth
3b461ee11f choicegroup should only process choices belonging to its input_id 2012-10-13 06:13:33 +00:00
Victor Shnayder
49a921c81e Merge pull request #873 from MITx/feature-alex-crystallography-mitx 
Feature alex crystallography mitx
 2012-10-12 20:11:41 -07:00
Victor Shnayder
adae176943 merge 2012-10-12 23:06:39 -04:00
Victor Shnayder
db8639e06a Fix preview code 
- I'm starting to vaguely understand js variable scope and closures.  Long way to go though :)
 2012-10-12 22:52:41 -04:00
Victor Shnayder
48de4b40ee Fix my js_loader patch 
* still call the callback when skipping duplicate file.  This updates the completed flags, and so the overall "we're done" callback fires properly.
 2012-10-12 22:52:02 -04:00
chrisndodge
edb31c97b6 Merge pull request #890 from MITx/feature/cdodge/cas-new-course 
Feature/cdodge/cas new course
 2012-10-12 18:34:40 -07:00