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
jm
a0e3e7b3e5
Added 1 new color
2012-04-10 14:36:50 -04:00
Lyla Fischer
718475662f
added weighting system for the midterm
2012-04-10 10:34:51 -04:00
Piotr Mitros
8c0503d33c
Added comments
2012-04-10 08:10:52 -04:00
Piotr Mitros
c06c6104ca
Grading histogram
2012-04-10 08:03:26 -04:00
David Ormsbee
86b413ff8c
fix syslogger errors
2012-04-09 17:17:03 -04:00
David Ormsbee
5afddedc94
add debug toolbar to content machines
2012-04-09 17:16:52 -04:00
David Ormsbee
a73ba49bef
syslog address needs to be a server, port tuple
2012-04-09 17:07:00 -04:00
David Ormsbee
ddb425dae6
point aws settings to syslog server
2012-04-09 17:04:18 -04:00
David Ormsbee
8f4696a1ea
add logging environment to ENV_TOKENS
2012-04-09 16:57:35 -04:00
David Ormsbee
0d07ebc921
Merge branch 'master' into move_settings
...
Conflicts:
static/simplewiki
2012-04-09 16:47:45 -04:00
David Ormsbee
29b3b0cfeb
remove unnecessary comments
2012-04-09 16:39:04 -04:00
David Ormsbee
be0fdf0cbc
add config for content machines
2012-04-09 16:32:54 -04:00
David Ormsbee
ef5b6f6537
remove LIB_URL from env config (it's always local)
2012-04-09 16:24:16 -04:00
