Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
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
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
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
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
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
arjun810
1ec0fae801 Merge pull request #891 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax
 2012-10-13 17:05:44 -07:00
kimth
113e8b97b6 Toggle shouldn't follow anchor 2012-10-13 16:19:54 +00:00
kimth
3b461ee11f choicegroup should only process choices belonging to its input_id 2012-10-13 06:13:33 +00: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
ichuang
73477ec1bf reset_problem in capa_module should always return dicts not strings 2012-10-12 21:06:15 -04:00
Chris Dodge
a12baec599 add new files 2012-10-12 20:55:16 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00
Victor Shnayder
619e9f18ac Merge pull request #884 from MITx/feature/victor/capa-ajax 
address Ike's comments.
 2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac address Ike's comments. 2012-10-12 17:03:11 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
Chris Dodge
4e4b6accda wip: create new course 2012-10-12 16:11:55 -04:00
Victor Shnayder
d78e041c2d Testing and small fixes 
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
 2012-10-12 15:32:36 -04:00
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
Victor Shnayder
f6f2663b77 fix arrows list 2012-10-12 14:08:21 -04:00
Victor Shnayder
b6f7427e22 make tests pass again 2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00
Chris Dodge
d31a7c6d6b log and continue on thumbnail generation exception 2012-10-12 13:11:55 -04:00
Chris Dodge
b17836f232 swallow exceptions when generating thumbnails 2012-10-12 12:27:21 -04:00
chrisndodge
ff25d13256 Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression 
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
 2012-10-12 08:17:35 -07:00
chrisndodge
750e70e842 Merge pull request #878 from MITx/feature/cale/edge-landing-page 
Feature/cale/edge landing page
 2012-10-12 08:01:46 -07:00
Chris Dodge
281f194b2a per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type 2012-10-12 11:00:34 -04:00
Chris Dodge
1015b3a974 DraftMongoContentStore needs to both delete the draft *and* the non-draft entities 2012-10-12 11:00:34 -04:00
Chris Dodge
14a1a7da31 allow importing of .tar.gz packages of courseware 2012-10-12 10:33:31 -04:00
Calen Pennington
4814f8c38e Cleaning up logos for edge landing page 2012-10-12 10:31:46 -04:00
Calen Pennington
c814758715 Merge pull request #866 from MITx/feature/cdodge/cms-import 
Feature/cdodge/cms import
 2012-10-11 19:22:19 -07:00
Victor Shnayder
c420c67b82 Actually implement exact vs factors-don't-matter comparisons in chemcalc 2012-10-11 17:40:26 -04:00
Chris Dodge
82abdd07dc respond to some of Cale's comments 2012-10-11 16:23:28 -04:00
Tom Giannattasio
c3e2a544da tweaks to datepicker and calendar 2012-10-11 14:53:45 -04:00
Chris Dodge
bf392e360a on import set course metadata to hide the progress tab since we don't yet support grading policies 2012-10-11 13:52:15 -04:00
Chris Dodge
a521ea239f baseline working for importing courseware and static assets 2012-10-11 13:41:16 -04:00
David Ormsbee
9c0e554992 Merge pull request #855 from MITx/bug/tomg/nested-hints 
tweaked collapsible selector to target the proper section
 2012-10-11 10:25:21 -07:00
Chris Dodge
bb46c5f909 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import 2012-10-11 12:51:37 -04:00