Commit Graph

1250 Commits

Author SHA1 Message Date
kimth
1a02cfec83 Reset CapaProblem when state HTML is corrupt 2012-09-15 23:25:26 -04:00
David Ormsbee
f1349eea33 Merge pull request #656 from MITx/kimth/fix-dynamath-6002x
Kimth/fix dynamath 6002x
2012-09-15 11:28:16 -07:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Kyle Fiedler
8fa8450fbf Added color to span and removed width from bottom sequence navigation 2012-09-14 16:13:37 -04:00
David Ormsbee
31cb793037 Merge pull request #680 from MITx/kimth/fix-detailed-solution
Do variable substitution for detailed solutions
2012-09-14 07:22:19 -07:00
Arjun Singh
a46b8e5f01 fix old-style customresponses 2012-09-13 23:16:47 -07:00
Carlos Andrés Rocha
5ce16738fb Reverting to original video player 2012-09-13 18:38:48 -04:00
kimth
b43da7463a Do variable substitution for detailed solutions 2012-09-13 15:12:18 -04:00
kimth
f0638f8a6f Merge pull request #677 from MITx/bug/kfiedler/tonys-bugs
A bunch of solutions for bugs Tony had reported
2012-09-13 08:36:37 -07:00
kimth
bee1c50d9f Merge pull request #678 from MITx/rocha/hotfixes
Temporary fix to set the speed of video player to 1.0
2012-09-13 08:29:35 -07:00
Carlos Andrés Rocha
9fb5346571 Temporary fix to set the speed of video player to 1.0 regardless of previous state 2012-09-13 11:26:52 -04:00
Kyle Fiedler
d107370b11 Made min width smaller for dynomath 2012-09-13 11:24:07 -04:00
Kyle Fiedler
5548e252c6 Hide list style for video elements 2012-09-13 11:24:07 -04:00
Kyle Fiedler
7812dd68fe Added more padding for detailed answer 2012-09-13 11:24:07 -04:00
kimth
7f67e9a060 Merge pull request #668 from MITx/bug/kfiedler/ie
Fix IE bugs including schematic editor text alignment
2012-09-13 08:20:11 -07:00
kimth
d2d1ac71fe Use Coffeescript existential operator 2012-09-13 11:12:41 -04:00
kimth
a55f37cd9d Problem js runs MathJax only over its own contents rather than full page 2012-09-13 11:04:37 -04:00
Calen Pennington
5450ddbde3 Merge pull request #674 from MITx/feature/victor/fix-colons-in-html
Add more tests and replace ':' with '_' in html_id
2012-09-13 07:30:46 -07:00
Victor Shnayder
0bbba8b16f Add more tests and replace ':' with '_' in html_id
* in-progress to fixing support for ':' in url_names
2012-09-13 09:44:51 -04:00
kimth
eb095f383e Merge branch 'master' into kimth/fix-dynamath-6002x 2012-09-13 08:52:25 -04:00
Carlos A. Rocha
67cbf50b83 Fix swfobject and django-pipeline - Cosmetic fix for youtube player 2012-09-13 01:08:59 -04:00
Carlos A. Rocha
df5e6d6860 Replace http with https for embedder youTube 2012-09-13 00:16:13 -04:00
Carlos A. Rocha
11d0c0d4b6 Remove video controls, use default youTube controls instead 2012-09-13 00:10:20 -04:00
Carlos A. Rocha
27fa9a38d8 Temporary fix for youTube iframe player issues 2012-09-12 23:56:05 -04:00
kimth
2105755120 MathJax initial render needs to be properly queued 2012-09-12 18:24:52 -04:00
Kyle Fiedler
1dceff78b5 Fix alignment in tables for ie 2012-09-12 16:01:38 -04:00
David Ormsbee
53d0a6add8 Merge pull request #654 from MITx/feature/victor/fix-trailing-location-url
make the test ajax_url format consistent with real code
2012-09-12 12:19:53 -07:00
kimth
e3c6477826 Merge branch 'master' into kimth/fix-dynamath-6002x 2012-09-12 13:34:01 -04:00
Kyle Fiedler
596d926eac Added fix so that sequnce nave doesn't go over full screen videos 2012-09-12 11:06:01 -04:00
Tom Giannattasio
7098b2e658 cleaned up loading animation in post-list 2012-09-12 10:07:16 -04:00
Arjun Singh
bd5fc64462 make seeds consistent with other responsetypes 2012-09-11 18:08:27 -07:00
arjun810
b0e4bebc63 Merge pull request #661 from MITx/kimth/fix-firefox-cktsim
Fix circuit simulator js for Firefox
2012-09-11 16:15:55 -07:00
kimth
88e138bfaa Merge pull request #662 from MITx/feature/arjun/fix_seed
Provide a reasonable seeding mechanism for jsresponses
2012-09-11 16:15:14 -07:00
kimth
474b5377b9 Consolidate class names 2012-09-11 18:25:08 -04:00
Arjun Singh
5e4a498cfe Provide a reasonable seeding mechanism for jsresponses 2012-09-11 15:09:49 -07:00
kimth
f35412f3f4 Don't bind update_schematics to global window.onload 2012-09-11 16:29:17 -04:00
Tom Giannattasio
00156fd600 fixed textbook bug 2012-09-11 10:14:20 -04:00
ichuang
1f07bb0466 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/psychometrics 2012-09-10 22:03:08 -04:00
ichuang
56d44ec7f3 display_name may be empty (eg in tests) 2012-09-10 21:55:58 -04:00
ichuang
c6f794547f more tabs -> spaces 2012-09-10 21:45:38 -04:00
ichuang
d8c8c85041 tabs to spaces 2012-09-10 21:42:44 -04:00
ichuang
97a32e64ee fix tooltip titles in seq_module for non-new-xml-format courses 2012-09-10 21:33:54 -04:00
ichuang
e62e58dc6e log attempts in tracking 2012-09-10 20:33:56 -04:00
kimth
bbfc875ff2 Merge branch 'master' into kimth/fix-dynamath-6002x 2012-09-10 19:45:14 -04:00
kimth
bd72fbdfd8 Allow textinputdynamath to specify its Mathjax preprocessor per-problem 2012-09-10 19:42:40 -04:00
kimth
971fe53dec Another step towards Javascriptinput-style script loading 2012-09-10 17:42:15 -04:00
Victor Shnayder
9266bcca6d fix stupid bug in textbook handling code 2012-09-10 17:42:01 -04:00
kimth
9931b5ae3f Mimic javascriptinput displayClass 2012-09-10 16:20:06 -04:00
kimth
5862d04b65 Set up mathjax_preprocessor 2012-09-10 15:16:40 -04:00
Victor Shnayder
b501367ed3 make the test ajax_url format consistent with real code
* specifically, no trailing slash
2012-09-10 14:28:09 -04:00