Calen Pennington
f4fa7436c6
Move bourbon back into the directory with scss so it can be imported properly
2012-04-20 14:37:40 -04:00
Calen Pennington
7dcc6b38ae
Moving sass compilation to django-pipeline
2012-04-20 14:20:09 -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
Bridger Maxwell
3bd6ce55be
Merged in master branch.
2012-04-17 18:37:57 -04:00
Bridger Maxwell
e9247920af
Moved potential failure outside of unrelated try/catch block that would have masked the missing settings.DATA_DIR
2012-04-17 18:28:59 -04:00
Bridger Maxwell
f987f99a06
Changed CourseGrader to be an abstract base class.
2012-04-17 18:17:43 -04:00
Bridger Maxwell
9ee09ec93a
Put graders into their own file. Incorporated other feedback from pull request.
2012-04-17 18:07:56 -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
Bridger Maxwell
a117d020a2
Removed python code in templates to be javascript.
2012-04-17 13:54:47 -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
e780e4d87e
Put in precaution to be sure that any problems with a possible score of 0 are not graded.
2012-04-17 11:53:11 -04: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
Bridger Maxwell
b2891273b5
Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph.
2012-04-17 00:40:29 -04:00
Bridger Maxwell
386835153b
Added histogram graph for courseware administrators.
2012-04-17 00:17:12 -04:00
Bridger Maxwell
3e293f2a3d
Merge branch 'master' into grade-refactor
2012-04-16 22:17:45 -04:00
Bridger Maxwell
a763edab40
Just a bit of cleanup. No code changes
2012-04-16 22:15:58 -04:00
Bridger Maxwell
fcb530f1e3
Course settings are now defined in DATA_DIR/course_settings.py. Used by importing courseware.course_settings. The grader is defined in these settings files.
2012-04-16 22:10:08 -04:00
Bridger Maxwell
7b915cd123
Profile graph tooltips are a little more offset, so they don't appear under the mouse and flicker.
2012-04-16 17:45:53 -04:00
Bridger Maxwell
79ffd72521
Updated tests for new weighting method.
2012-04-16 17:28:18 -04:00
Bridger Maxwell
e3b397870f
Moved the weighting of problems to when problem scores are retrieved.
2012-04-16 16:57:24 -04:00
Bridger Maxwell
3860f333d6
Added parser for creating graders from a dictionary representation.
2012-04-16 16:13:51 -04:00
Lyla Fischer
f9a04406c2
fixed the default weight to not interfere with precedent
2012-04-16 12:25:22 -04:00
Bridger Maxwell
795fba0448
Got settings.GENERATE_RANDOM_PROFILE_SCORES working again. Mostly used for design previews.
2012-04-15 17:05:07 -04:00
Bridger Maxwell
02e92e0b31
Added comments explaining the grader protocol.
2012-04-15 16:48:06 -04:00
Bridger Maxwell
97f4f1b7ba
Added more tests and documentation to grade refactor.
2012-04-15 16:07:16 -04:00
Bridger Maxwell
03ea89f67f
Added some tests to the grading refactor. Fixed some bugs found during testing.
2012-04-14 18:42:20 -04:00
Bridger Maxwell
9ced4685c3
Merged in weighted_grades. Put in a holdover to stop crash when score.possible = 0
2012-04-13 18:14:08 -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
Bridger Maxwell
812810a670
Converted gradebook to refactored grading format.
2012-04-13 16:32:39 -04: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
