Commit Graph

14320 Commits

Author SHA1 Message Date
Calen Pennington
261948f38a Make textbooks in the course definition be stored as data, rather than objects, and turn them into objects during module instatiation 2012-09-17 13:19:24 -04:00
kimth
9e01b51f96 Tiny fix to style 2012-09-16 16:46:19 -04:00
arjun810
0e1a56d9fe Merge pull request #699 from MITx/kimth/remember-caption
Kimth/remember caption
2012-09-16 12:50:23 -07:00
kimth
1dfd222b98 Escape quotations, lt/gt, ampersand 2012-09-16 14:50:40 -04:00
kimth
44d5bfa9d0 Trivial fix to detailed-solution style 2012-09-16 10:27:37 -04:00
Arjun Singh
7682663e1b Make broken problem error a bit scarier and fix typo in message 2012-09-15 22:07:10 -07:00
kimth
2c239f87e8 Change wording of warning slightly 2012-09-16 00:48:53 -04:00
kimth
f5d6f080c7 Add basic styles 2012-09-16 00:47:40 -04:00
kimth
eac8037808 Add TODO comment 2012-09-16 00:29:48 -04:00
kimth
827e211ac7 Reveal student input at state of problem reset back to student 2012-09-16 00:27:41 -04:00
kimth
1a02cfec83 Reset CapaProblem when state HTML is corrupt 2012-09-15 23:25:26 -04:00
kimth
68e0701113 Remove extra line 2012-09-15 17:23:41 -04:00
kimth
439ca1dd59 Write setter, toggle uses setter 2012-09-15 17:18:21 -04:00
kimth
1625125e6f Respect object boundaries 2012-09-15 16:55:43 -04:00
kimth
c031020099 Merge branch 'master' into kimth/remember-caption 2012-09-15 15:47:22 -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
kimth
d893a14a53 Load player before turning off caption 2012-09-14 17:24:15 -04:00
kimth
8673460b85 Merge branch 'master' into kimth/remember-caption 2012-09-14 16:53:41 -04:00
kimth
210da2c4f0 Start to remember caption state 2012-09-14 16:53:23 -04:00
Kyle Fiedler
8fa8450fbf Added color to span and removed width from bottom sequence navigation 2012-09-14 16:13:37 -04:00
Victor Shnayder
a788db53e9 Show login modal if there's a next param to index, university index
* also replace the external-auth-related popping up of the signup form with jquery.
Presumably it takes care of the browser specific stuff.
2012-09-14 14:31:04 -04:00
Kyle Fiedler
0170fcc01c styles for a slightly better multiple choice and solution span 2012-09-14 13:25:55 -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
Kyle Fiedler
03ad061a2f style for submission feedback 2012-09-13 20:10:45 -04: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