David Ormsbee
f0bec48c54
move more of our AWS config to tokens from JSON files
2012-04-09 16:11:54 -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
David Ormsbee
9fe7f5626d
add django toolbar to depenedencies
2012-04-09 12:22:03 -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
245a3d97a8
Simplified the parameters for AssignmentFormatGrader
2012-04-08 01:58:21 -04:00
Bridger Maxwell
c1e6dd8005
Added single section grader. Midterm and Final are now graded.
2012-04-08 00:38:00 -04:00
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
