Commit Graph

1625 Commits

Author SHA1 Message Date
Piotr Mitros
fd3e571478 Took out print 2012-04-24 18:42:13 -04:00
Piotr Mitros
58a0a7d0d6 Case sensitivity bug fix 2012-04-24 18:27:54 -04:00
Kyle Fiedler
2908b7b3ba More minor tweeks 2012-04-24 11:09:33 -04:00
Kyle Fiedler
aa6901e69d Small tweeks to the css 2012-04-24 11:09:33 -04:00
Kyle Fiedler
16aaf688d8 Sorry firefox you don't get fulllscreen 2012-04-24 11:09:32 -04:00
Kyle Fiedler
7d9e02cbdf Added some bug fixes 2012-04-24 11:09:32 -04:00
Kyle Fiedler
74addbc9ec Compiled Sass 2012-04-24 11:09:32 -04:00
Kyle Fiedler
b24cf842dc Added more bug fixes 2012-04-24 11:09:32 -04:00
Kyle Fiedler
460849a360 added fix for html5 2012-04-24 11:09:32 -04:00
Kyle Fiedler
4d02f5d6aa Added fixes for bugs for the video 2012-04-24 11:09:32 -04:00
Kyle Fiedler
a7787d2320 Added some more small bug fixes 2012-04-24 11:09:32 -04:00
Kyle Fiedler
327598b71b Added some fixeds to the dropdown and made it on hover 2012-04-24 11:09:32 -04:00
Kyle Fiedler
67db5c12f5 Added arrow to show the dropdown 2012-04-24 11:09:32 -04:00
Kyle Fiedler
1f6209da11 Added styles and tooltips for full screen and captions 2012-04-24 11:09:31 -04:00
Kyle Fiedler
c4b5b6b3c0 Added some fixes for bugs in full screen mode 2012-04-24 11:09:31 -04:00
Kyle Fiedler
8b563c0c9d added some more styles for the fullscreen video 2012-04-24 11:09:31 -04:00
Kyle Fiedler
2be9a1e6d2 Removed fullscreen js as it breaks the video 2012-04-24 11:09:31 -04:00
Kyle Fiedler
3c60d7a69b Added hover over video bar and js to possibly go true full screen 2012-04-24 11:09:31 -04:00
Kyle Fiedler
9bfd25b4aa removed mac .ds_store file 2012-04-24 11:09:31 -04:00
Kyle Fiedler
98aa962034 Fixed issues with full screen 2012-04-24 11:09:31 -04:00
Kyle Fiedler
6c25054469 remove some styling for inline videos 2012-04-24 11:09:31 -04:00
Kyle Fiedler
a79bba506d Tring to get overlay to work with display table 2012-04-24 11:09:30 -04:00
Calen Pennington
26a3e6cdf4 Merge pull request #11 from MITx/move_settings
Reorganize settings files for different environments
2012-04-19 07:52:02 -07:00
David Ormsbee
c23d2804be slightly simplified urlpatterns setting in urls.py 2012-04-19 10:50:32 -04:00
David Ormsbee
efc057109e remove references to unused TEXTBOOK_DIR, add comments 2012-04-19 10:36:14 -04:00
David Ormsbee
0316d9718c enable mathjax in askbot 2012-04-19 10:26:26 -04:00
David Ormsbee
a476571e52 apparently ASKBOT_CLOSED_FORUM_MODE doesn't work outside LIVESETTINGS either... 2012-04-18 21:23:46 -04:00
David Ormsbee
81e9a39a89 add askbot closed forum mode to settings.py (not just inside LIVESETTINGS) 2012-04-18 21:05:44 -04:00
Calen Pennington
8ec81a1c2b Removing hardcoded dependencies in favor of deps from puppet 2012-04-18 18:13:24 -04:00
Calen Pennington
a49057dfbf Deploy packages to /opt/wwc, rather than /opt/packages 2012-04-18 14:58:16 -04:00
Calen Pennington
ce346f6608 Don't use sudo during configuration script 2012-04-18 14:35:18 -04:00
Calen Pennington
c7c74c729c Make code be owned by makeitso 2012-04-18 14:24:09 -04:00
Calen Pennington
ee5dedad4e Revert "Use git to get the branch name and commit number, rather than incoming environment variables"
This reverts commit d6a57558d7.
2012-04-18 13:06:25 -04:00
Calen Pennington
d6a57558d7 Use git to get the branch name and commit number, rather than incoming environment variables 2012-04-18 12:47:38 -04:00
Calen Pennington
033f525182 Lowercase the branch name while building .debs 2012-04-18 12:43:24 -04:00
David Ormsbee
d8ba61cfb2 put a querystring on application.css to force reloading of it 2012-04-18 11:46:49 -04:00
David Ormsbee
a6fb97affa Catch Exception instead of ValueError for accessing our general content cache -- exception thrown changed in django 1.4 2012-04-17 13:59:30 -04:00
David Ormsbee
2905ac7cfe Merge pull request #20 from MITx/weighted_defaults
Fixed zero-score-possible bug.
2012-04-17 10:43:03 -07:00
Bridger Maxwell
da3424f67a Fixed zero-score-possible bug. 2012-04-17 11:45:24 -04:00
David Ormsbee
84ba2168a5 Merge pull request #17 from MITx/weighted_defaults
fixed the default weight to not interfere with precedent
2012-04-17 07:52:33 -07:00
Lyla Fischer
f9a04406c2 fixed the default weight to not interfere with precedent 2012-04-16 12:25:22 -04:00
David Ormsbee
eff95c267e Merge pull request #15 from MITx/weighted_grading
added weighting system for the midterm

It'd be nice to move the Score.__sub__ as we discussed, but that shouldn't hold up merging the rest so it can be put on the staging environments and tested more thoroughly.
2012-04-13 14:06:40 -07:00
Lyla Fischer
7853af5415 more tests 2012-04-13 16:29:12 -04:00
Lyla Fischer
287a086cfb changed tests 2012-04-13 15:27:26 -04:00
Lyla Fischer
e49fd7002d respones to code review 2012-04-13 14:34:09 -04:00
David Ormsbee
a71340d3a7 enable mathjax in askbot 2012-04-12 18:57:20 -04:00
David Ormsbee
c59d70d54f Merge pull request #13 from MITx/pmitros/histogram
Pmitros/histogram
2012-04-12 11:53:18 -07:00
Lyla Fischer
bfff822287 AGH! midterm/final 2012-04-11 10:28:55 -04:00
Lyla Fischer
a49a2fc600 oops - final/midterm 2012-04-11 10:27:34 -04:00
Lyla Fischer
79a0a9bf7d include the final once it exists 2012-04-11 10:09:42 -04:00