Calen Pennington
9cba2232d5
Run all tests all the way through before quitting on errors
2012-08-07 13:32:58 -04:00
thomasxiii
258b9eb530
Merge pull request #349 from MITx/feature/kfiedler/courseware-style
...
A bunch of various fixes and de-styling
2012-08-07 10:20:10 -07:00
Calen Pennington
96252aea80
Merge pull request #358 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-07 09:01:41 -07:00
Kyle Fiedler
dd6ec19e80
Make the modal window work in the courseware
2012-08-07 11:59:49 -04:00
kimth
05646fbed7
Provide default xqueue in ModuleSystem
2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3
Merge master
2012-08-07 11:51:44 -04:00
ichuang
c79da58175
add documentation on rake + unit tests
2012-08-07 11:48:01 -04:00
kimth
b6dc622e42
Remove temporary datetime
2012-08-07 11:43:00 -04:00
kimth
c39edb650b
StudentModule lookups in queue callback use target user, rather than request.user
2012-08-07 11:38:04 -04:00
kimth
501f2ccf14
CodeResponse uses 'is_file' helper function
2012-08-07 11:30:21 -04:00
kimth
f6202e5631
Tests provide xqueue params, rather than ModuleSystem.__init__
2012-08-07 11:16:48 -04:00
Calen Pennington
e847bae267
Merge pull request #344 from MITx/feature/victor/file-per-descriptor
...
Feature/victor/file per descriptor
2012-08-07 08:09:59 -07:00
Victor Shnayder
b4e400ba56
Make tests pass again again
...
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747
Make tests pass again
...
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32
always export metadata in alphabetical order
2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5
a few pep8 cleanups
2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e
Generate error module url_names using sha1
...
* means we get the same url_name on each import of the same data.
2012-08-07 11:06:47 -04:00
Victor Shnayder
ecf432ad78
Make the simple course pass roundtrip test:
...
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8
Make url_names on error descriptors unique
2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525
Make initial import-export tests pass.
...
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
- try to preserve origin slug. If not possible, generate random one.
* figure out what metadata to strip. e.g.
({'data': '<problem><p><h1>Finger Exercise 1...'},
{'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
False)
- where did points and type come from? Do we want them there?
* separate broken and non-broken test courses
2012-08-07 11:06:47 -04:00
Victor Shnayder
b091dcabe0
metadata and file format cleanups
...
* course.xml is special--has org and course attributes in addition to url_name
* strip data_dir from metadata on export
* more asserts
* work on roundtrip import-export test
2012-08-07 11:06:47 -04:00
Victor Shnayder
6ed9052755
minor cleanups
2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92
Make unknown metadata persist accross import-export
...
* +improve test.
2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3
New file structure--everything in own file
...
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
2012-08-07 11:06:46 -04:00
ichuang
ca177570fa
Merge pull request #356 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-07 07:56:23 -07:00
ichuang
4c25baee43
Merge pull request #355 from MITx/arjun/choicegroup_text
...
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
2012-08-07 07:55:01 -07:00
ichuang
462d75936a
Merge pull request #357 from MITx/hotfix-registration
...
fix typo in registration button jquery
2012-08-07 07:11:53 -07:00
ichuang
4b2091b173
fix typo in registration button jquery
2012-08-07 10:09:55 -04:00
kimth
cb2fbfa54c
Added test for answers file-to-filename conversion
2012-08-07 09:38:36 -04:00
kimth
ceeea66417
Fix overrzealous file_to_filename conversion and fix CapaProblem unit tests
2012-08-07 09:24:17 -04:00
Calen Pennington
c5fa6bac89
Merge pull request #353 from MITx/ichuang/showhide-staff-debug
...
make the staff debug information appear in a show/hide span
2012-08-07 05:43:14 -07:00
Calen Pennington
e14ebaafc3
Merge pull request #345 from MITx/MITx/feature/bridger/fast_course_grading
...
Fast grading
2012-08-07 05:39:18 -07:00
Bridger Maxwell
3a52e86a87
Fixed weighting of individual problems. Unmodified problems have weight None, not 1.
2012-08-07 08:00:06 -04:00
Bridger Maxwell
8287e5a13f
Fixed grading bug where list comprehension variable overrode local variable.
2012-08-07 07:33:35 -04:00
Arjun Singh
19fa50a882
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup.
2012-08-07 02:38:23 -04:00
kimth
49b1678bf4
Merge pull request #354 from MITx/arjun/grading_fix
...
arjun/grading fix
2012-08-06 22:28:57 -07:00
Arjun Singh
323fb18c74
Poor fix for a breaking change in which student answers that were arrays (e.g. those resulting from a checkbox group) would be converted to strings and graded incorrectly.
2012-08-07 00:14:48 -04:00
Arjun Singh
96746721c4
Fixed incorrect default argument so that tests run; however the new value is incorrect and needs to be fixed.
2012-08-07 00:11:39 -04:00
ichuang
fa8bf7f371
make the staff debug information appear in a show/hide span
2012-08-06 21:54:29 -04:00
kimth
0940a3cc83
Merge pull request #352 from MITx/kimth/lms-coderesponse
...
Don't contact queueing server on Django load
2012-08-06 16:09:56 -07:00
kimth
d3f4746f57
Don't contact queueing server on Django load
2012-08-06 19:02:40 -04:00
Bridger Maxwell
69ba80bf63
Merge branch 'master' into MITx/feature/bridger/fast_course_grading
2012-08-06 18:51:59 -04:00
Bridger Maxwell
873f1431ec
Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)
2012-08-06 18:51:11 -04:00
ichuang
926763a3d6
Merge pull request #351 from MITx/edit-link-fix
...
Edit link fix
2012-08-06 15:44:34 -07:00
ichuang
6dfbb222ab
Merge branch 'master' of github.com:MITx/mitx
2012-08-06 18:41:18 -04:00
ichuang
ff5773c0d9
Merge pull request #348 from MITx/kimth/lms-coderesponse
...
merging this now because the it looks ok, and it fixes some bugs introduced by the last xserver merge, which are preventing the LMS from running in the current version of master.
2012-08-06 15:40:56 -07:00
ichuang
9728b429b7
Merge branch 'kimth/lms-coderesponse' of github.com:MITx/mitx
2012-08-06 18:36:11 -04:00
ichuang
f47ab30c3f
small fix to xmodule_modifiers to fix case when filename missing
2012-08-06 18:34:54 -04:00
kimth
18a7f58735
Handle xreply parsing errors more gracefully
2012-08-06 17:44:07 -04:00
kimth
b6e9e7a4bb
Handle network errors more gracefully
2012-08-06 17:36:38 -04:00
