Commit Graph

55357 Commits

Author SHA1 Message Date
Bridger Maxwell
779c247512 Weighted scores now working in the refactor and show up correctly on the profile graph. Dropped score markers are back too. 2012-04-07 19:21:19 -04: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 Maxwell
04221210de Weighted section grading is mostly working, but the final grade isn't on the graph yet. 2012-04-06 15:47:21 -04:00
Bridger Maxwell
b0e2ea3a63 Still working on grades refactor. Not working yet, but reached a checkpoint. 2012-04-06 15:04:49 -04:00
Bridger Maxwell
a0eb072aff Refactoring grades. Adding more generic grading classes. Probably broken right now. Just committing to save progress. 2012-04-05 21:29:38 -04:00
Bridger Maxwell
60caf0aa10 Added grades SectionPercentage namedtuple. Fixed bug where problem ids were being used for section labels in graph. 2012-04-05 16:56:16 -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
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
Piotr Mitros
df637d32a2 Typo in gradebook 2012-04-03 15:56:14 -04:00
David Ormsbee
ab6ec55a83 Convert AWS settings to pull values from JSON files 2012-04-03 12:54:02 -04:00
David Ormsbee
d7131c8b13 Update requirements: add path.py (used in settings), remove flup (only necessary for FCGI) 2012-04-02 16:38:33 -04:00
David Ormsbee
55312bf7db show instructions for gunicorn 2012-04-02 14:58:04 -04:00
Bridger Maxwell
5aa68c9bb9 Removed code accidentally left in. 2012-04-02 14:47:02 -04:00
David Ormsbee
98ff3d5bfb Merge branch 'master' into move_settings
Conflicts:
	djangoapps/student/views.py
	urls.py
2012-04-02 14:26:05 -04:00
David Ormsbee
f0d80a0738 Flesh out the README.txt for the new settings arrangement 2012-04-02 14:20:00 -04:00
David Ormsbee
3a95e3f79f Moving settings2/ folder to envs/ 2012-04-02 14:15:44 -04:00
David Ormsbee
a90e6e3243 Disable profiler in django-debug-toolbar to avoid duplicate request bug 2012-04-02 14:11:23 -04:00
David Ormsbee
d1cd7e50c0 change logging from mitx.user to mitx.student to reflect package structure 2012-04-02 14:09:53 -04:00
Bridger Maxwell
3dee54429d More comments on mdx_circuit.py. Incorporated some pull request feedback. 2012-04-01 15:15:39 -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
26c0a24a0f Added generated css files. 2012-03-31 15:43:49 -04:00
Bridger Maxwell
bf7bf61cd5 Moved styling to sass. Editor now looks like textarea used to. 2012-03-31 15:43:09 -04:00
Monitor Machine
0c69e00932 Settings has a default sqlite database 2012-03-30 18:22:44 -04:00
Monitor Machine
c121f2b024 Django version restriction 2012-03-30 09:16:11 -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
183774f637 Fixed codemirror arrowkey navigation bug. 2012-03-29 22:27:55 -07:00
Bridger Maxwell
d7383bf3c4 Small cleanups in codemirror. 2012-03-29 18:21:25 -07:00