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
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
David Ormsbee
d8ba61cfb2
put a querystring on application.css to force reloading of it
2012-04-18 11:46:49 -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
e49fd7002d
respones to code review
2012-04-13 14:34:09 -04:00
David Ormsbee
c59d70d54f
Merge pull request #13 from MITx/pmitros/histogram
...
Pmitros/histogram
2012-04-12 11:53:18 -07:00
jm
a0e3e7b3e5
Added 1 new color
2012-04-10 14:36:50 -04:00
Piotr Mitros
c06c6104ca
Grading histogram
2012-04-10 08:03:26 -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
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
Kyle Fiedler
d4a462bd74
only transform height and witdh
2012-04-04 14:23:15 -04: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
Kyle Fiedler
ceb8d4bf5b
fix some small css bugs in askbot
2012-04-03 16:48:00 -04:00
Piotr Mitros
cec1ecf952
Merge branch 'master' of github.com:MITx/mitx
2012-04-03 16:21:29 -04:00
Kyle Fiedler
3111bdd3a0
Added specificity to the input styles for password reset
2012-04-03 16:18:15 -04:00
Piotr Mitros
e2e9f8904e
Gradebook bug. Maybe fixed? Maybe not? Deploy debugging.
2012-04-03 15:59:58 -04:00
Bridger Maxwell
d390e9983b
Changed CodeMirror back to use a monospaced font, which is important.
2012-03-31 16:59:39 -04:00
Bridger Maxwell
bf7bf61cd5
Moved styling to sass. Editor now looks like textarea used to.
2012-03-31 15:43:09 -04:00
Bridger Maxwell
6f2f218bea
The wiki creation page now uses the edit template, so it has the unsaved changes confirmation and Codemirror editor.
2012-03-30 06:03:10 -07:00
Bridger Maxwell
acbe1e8860
Re-enabled unsaved changes confirmation on wiki edit.
2012-03-30 05:49:32 -07:00
Bridger Maxwell
283ad48c25
Changed instructions for circuit-schematic:
2012-03-29 16:41:44 -07:00
Bridger Maxwell
4938fb63da
Set size of wiki circuits
2012-03-29 16:39:06 -07:00
Kyle Fiedler
162fa59441
Merge branch 'master' into pmitros/name-change
...
Conflicts:
static/css/application.css
static/css/marketing.css
2012-03-29 11:08:41 -04:00
Kyle Fiedler
393044fba9
cleaned up some css
2012-03-29 10:45:52 -04:00
David Ormsbee
dbb4ff18b0
minor user message changes
2012-03-29 10:44:06 -04:00
Piotr Mitros
686b1bf6bd
Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates
2012-03-28 19:44:22 -04:00
Piotr Mitros
eeffa7a6d2
http to https in confirmation e-mails
2012-03-28 17:50:51 -04:00
Piotr Mitros
9a7c0451ab
Better logging. Tested and fixed bugs in previous commits
2012-03-28 17:45:43 -04:00
Bridger Maxwell
f95aa496fa
Better compatibility with the Codemirror editor and the markdown circuit extension.
2012-03-28 14:09:21 -07:00
Kyle Fiedler
7d3caf58e2
Fixed buttons for most sequnces
2012-03-28 15:48:30 -04:00
