David Ormsbee
a4d4a3b022
Merge pull request #650 from MITx/feature/bridger/course_grading
...
Feature/bridger/course grading
2012-09-21 08:10:03 -07:00
Tom Giannattasio
68fe164b3b
Merge pull request #745 from MITx/feature/lyla/optionresponseformatting
...
removed line from optioninput field formatting
2012-09-21 06:26:18 -07:00
Lyla Fischer
1dfb745751
removed line from optioninput field - it makes it look like the end of a question
2012-09-20 19:03:16 -04:00
Bridger Maxwell
68ab19730f
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
...
Conflicts:
lms/djangoapps/courseware/views.py
2012-09-20 17:42:31 -04:00
Bridger Maxwell
188eeed3a3
Removed accidental symlink.
2012-09-20 17:41:02 -04:00
Bridger Maxwell
997c0ee1c6
Grading test now tries a weighted problem.
2012-09-20 17:38:07 -04:00
Bridger Maxwell
dfa977dbfa
Fixed problem weighting bug. Attribute is on descriptor, not module.
2012-09-20 17:37:34 -04:00
Bridger Maxwell
92171ea5da
Added course grading test.
2012-09-20 16:56:27 -04:00
Bridger Maxwell
9ce3b83be3
Added a simple course for testing the grading functions.
2012-09-20 13:29:16 -04:00
Bridger Maxwell
a43b09c0a9
Fixed new implementation of abtest's displayable_items.
2012-09-20 13:23:47 -04:00
Bridger Maxwell
b62e13aec8
Using new xmodule API in grades.py.
2012-09-20 02:06:41 -04:00
Victor Shnayder
27cd9c9f82
Remove unused 'module' parameter from replace_{static,course}_urls
2012-09-20 01:12:33 -04:00
Bridger Maxwell
28826b8a36
Added new API to xmodule(descriptor). get_children_locations and has_dynamic_children.
2012-09-20 00:31:37 -04:00
David Ormsbee
dcd32abc0e
Merge pull request #729 from MITx/feature/dave/textbook_fixes
...
Fixing textbook bugs that didn't appear in 6.002x
2012-09-19 14:58:24 -07:00
David Ormsbee
f9a49ece6f
Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values
2012-09-19 17:12:08 -04:00
kimth
b3bde7d631
Merge pull request #727 from MITx/feature/tomg/multiple-choice
...
fixed styles for checkboxes
2012-09-19 11:05:54 -07:00
Tom Giannattasio
82ab2e5a67
fixed styles for checkboxes
2012-09-19 14:03:56 -04:00
kimth
3428f5f45a
Merge pull request #726 from MITx/feature/tomg/multiple-choice
...
polished multiple choice question styles
2012-09-19 08:48:19 -07:00
Tom Giannattasio
2c4b335f98
polished multiple choice question styles
2012-09-19 11:02:45 -04:00
arjun810
501d44d023
Merge pull request #722 from MITx/kimth/fix-imageresponse
...
Don't break on empty answer string
2012-09-18 13:43:18 -07:00
kimth
d401a32709
Don't break on empty answer string
2012-09-18 16:39:58 -04:00
David Ormsbee
12586f3679
Merge pull request #718 from MITx/feature/cale/cms-drag-and-drop-children
...
Feature/cale/cms drag and drop children
2012-09-18 12:09:31 -07:00
Victor Shnayder
09909c7ec2
Merge pull request #711 from MITx/kimth/onreset-type
...
onreset rerandomize option
2012-09-18 11:09:25 -07:00
Calen Pennington
c1ce5a87ac
Move sequence nav into xmodule
2012-09-18 13:19:01 -04:00
David Ormsbee
62bb10156d
Merge pull request #704 from MITx/feature/victor/custom-tabs
...
Custom tabs
2012-09-18 07:10:42 -07:00
Calen Pennington
c914a46a3f
Merge pull request #691 from MITx/feature/victor/anon-deep-links
...
Feature/victor/anon deep links
2012-09-18 07:08:45 -07:00
Victor Shnayder
ba92bdc2dc
Merge pull request #708 from MITx/feature/cale/cms-bug-fixes
...
Feature/cale/cms bug fixes
2012-09-18 06:20:15 -07:00
Victor Shnayder
d9219c6086
Custom tabs
...
* specify in tabs list in course policy
- active page tracking now done in tabs.py
- properly handle the fact that there may be multiple textbooks
* Still need:
- wiki pages
- (if that's delayed, special-case syllabus support)
2012-09-18 08:45:09 -04:00
kimth
f45fa578a2
onreset rerandomize option
2012-09-17 15:56:09 -04:00
Tom Giannattasio
0acc75e3a4
fixed detailed-solution bug
2012-09-17 14:51:20 -04:00
Tom Giannattasio
3bf8ae8f09
double border fix
2012-09-17 14:44:32 -04:00
Tom Giannattasio
53ec558f11
fixed solution set glitch
2012-09-17 14:38:19 -04:00
Calen Pennington
c0ed793976
Add an empty get_errored_courses function for the mongo modulestore
2012-09-17 14:19:23 -04:00
Calen Pennington
34541b5e7c
Make a list of textbooks, don't just store a single one
2012-09-17 13:49:42 -04:00
Tom Giannattasio
97cff9c06f
Merge pull request #690 from MITx/feature/kfiedler/multiple-choice
...
styles for a slightly better multiple choice and solution span
2012-09-17 10:23:24 -07:00
Tom Giannattasio
092403c1bc
Merge pull request #688 from MITx/feature/kfiedler/submission-feedback
...
Style for submission feedback on problems
2012-09-17 10:21:04 -07:00
Calen Pennington
261948f38a
Make textbooks in the course definition be stored as data, rather than objects, and turn them into objects during module instatiation
2012-09-17 13:19:24 -04:00
kimth
9e01b51f96
Tiny fix to style
2012-09-16 16:46:19 -04:00
arjun810
0e1a56d9fe
Merge pull request #699 from MITx/kimth/remember-caption
...
Kimth/remember caption
2012-09-16 12:50:23 -07:00
kimth
1dfd222b98
Escape quotations, lt/gt, ampersand
2012-09-16 14:50:40 -04:00
kimth
44d5bfa9d0
Trivial fix to detailed-solution style
2012-09-16 10:27:37 -04:00
Arjun Singh
7682663e1b
Make broken problem error a bit scarier and fix typo in message
2012-09-15 22:07:10 -07:00
kimth
2c239f87e8
Change wording of warning slightly
2012-09-16 00:48:53 -04:00
kimth
f5d6f080c7
Add basic styles
2012-09-16 00:47:40 -04:00
kimth
eac8037808
Add TODO comment
2012-09-16 00:29:48 -04:00
kimth
827e211ac7
Reveal student input at state of problem reset back to student
2012-09-16 00:27:41 -04:00
kimth
1a02cfec83
Reset CapaProblem when state HTML is corrupt
2012-09-15 23:25:26 -04:00
kimth
68e0701113
Remove extra line
2012-09-15 17:23:41 -04:00
kimth
439ca1dd59
Write setter, toggle uses setter
2012-09-15 17:18:21 -04:00
kimth
1625125e6f
Respect object boundaries
2012-09-15 16:55:43 -04:00
