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
Calen Pennington
22bd9b9443
Move deployed packages to /opt/packages
2012-04-09 16:17:20 -04:00
Bridger Maxwell
a431ad19c7
Changed size of circuit schematic to be the same as old editor
2012-04-09 15:25:55 -04:00
David Ormsbee
6c44d00ab0
removed dead link to 3rdParty/static/js
2012-04-09 12:27:30 -04:00
David Ormsbee
6238f431b1
commenting out the use of S3 for static JS assets
2012-04-09 12:23:48 -04:00
Kyle Fiedler
1a1181c1af
Added generated css
2012-04-09 11:52:11 -04:00
Kyle Fiedler
583ff281d3
Reverted speed dropdown
2012-04-09 11:52:11 -04:00
pmitros
90cd57f6ad
Merge pull request #12 from MITx/check_button
...
Number of attempts remaining shown below -- not on button.
2012-04-09 08:14:44 -07:00
Bridger Maxwell
68c47236fb
Merge branch 'mathjax-hotfix'
2012-04-06 19:09:38 -04:00
Bridger Maxwell
14cd055e5e
Two potential sources of error fixed for MathJax wiki bug.
2012-04-06 19:00:38 -04:00
David Ormsbee
949745daa6
Remove broken symlink to simplewiki.
...
The only thing we used from that folder was the auto-suggest
JavaScript, and that got moved over to mitx/static/js/simplewiki
2012-04-06 15:49:30 -04:00
bridger
e7e86588a9
Merge pull request #10 from MITx/wikieditor
...
Wikieditor
2012-04-05 12:03:37 -07:00
Bridger Maxwell
202659cb1b
Merged in master branch
2012-04-05 14:50:36 -04:00
Lyla Fischer
a018b614fc
Merge branch 'master' of github.com:MITx/mitx
2012-04-05 14:19:16 -04:00
Lyla Fischer
abee617622
check button and "we already started" announcement
...
Changed the format of the check/submit button so that the exam
submission makes more sense; added a disclaimer to the enrollment
number so that new students know that they will be disadvantaged.
2012-04-05 14:18:22 -04:00
Kyle Fiedler
0704bb3787
Added lectures and solutions in epandable lists
2012-04-05 14:12:03 -04:00
Kyle Fiedler
78f8392599
added styles from old handouts
2012-04-05 14:12:03 -04:00
Calen Pennington
442d0691a5
Use the base package name as the provided value, rather than the path, because .deb packages can't start with /
2012-04-05 14:03:27 -04:00
Calen Pennington
a1224bd7b9
Mark that the mitx package provides /opt/wwc/mitx
2012-04-05 13:30:42 -04:00
Kyle Fiedler
d4a462bd74
only transform height and witdh
2012-04-04 14:23:15 -04:00
Reda Lemeden
c8a436eb9e
Merge pull request #6 from MITx/kf-captions
...
Added some styles to make videos more cohesive
2012-04-04 10:52:15 -07:00
Kyle Fiedler
34627fb0c9
Speed up dropdown animation
2012-04-04 12:20:28 -04:00
Kyle Fiedler
7c2cb55d81
Added some firefox fixes
2012-04-04 11:43:26 -04:00
Kyle Fiedler
4225317dad
Added some js to make the tooltip show the time
2012-04-04 10:26:14 -04:00
Kyle Fiedler
032f5fc928
Added style for the tooltip
2012-04-04 10:26:13 -04:00
Kyle Fiedler
26c6fe29c1
Added tooltip for time on video
2012-04-04 10:26:13 -04:00
Kyle Fiedler
1016843ae2
Added style and js for speed picker and hover for scrubber
2012-04-04 10:26:13 -04:00
Kyle Fiedler
ca69dc632f
Added styles for the captions and video bar
2012-04-04 10:26:13 -04:00
Kyle Fiedler
77bd47f749
Added some styles to make videos more cohesive
2012-04-04 10:26:12 -04:00
