Kyle Fiedler
643617599a
Made sequnce nav black and white
2012-08-08 16:27:47 -04:00
Bridger Maxwell
3930dabdc9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-08 16:00:22 -04:00
Calen Pennington
6abc2d733f
Merge pull request #370 from MITx/feature/bridger/django1.4
...
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1
courseware still not working..
2012-08-08 11:30:11 -04:00
Calen Pennington
80b8529f2f
Merge branch 'hotfix/1.0.4'
...
Conflicts:
common/djangoapps/util/middleware.py
2012-08-08 11:05:26 -04:00
Bridger Maxwell
696804da13
Changes from pull request comments.
2012-08-08 10:28:40 -04:00
Bridger Maxwell
0fe2abbbdb
Added docstring.
2012-08-07 18:39:19 -04:00
Bridger Maxwell
718499d793
Fix test failure from recent commit.
2012-08-07 18:37:27 -04:00
Bridger Maxwell
eb58f7c37c
Changed to more specific import of xmodule.util.decorators.
2012-08-07 18:32:53 -04:00
Bridger Maxwell
25662db914
Lazily loading capa problems (for faster grading).
2012-08-07 18:32:08 -04:00
Bridger Maxwell
1f34cf33fa
Speed improvements by making the mako rendering in CustomTagModule lazy.
2012-08-07 16:01:42 -04:00
Arjun Singh
b9f2d4bc13
Remove coffee libraries (use the system coffee); don't set the OS NODE_PATH but rather just read it in once and then modify the temporary environments used when executing node.
2012-08-07 15:52:39 -04:00
Arjun Singh
35d6c773f1
Clean up code for generating env for running node
2012-08-07 15:24:20 -04:00
Bridger Maxwell
a9d67c3e8d
Added has_score attribute to xmodule, for problem-like xmodules.
2012-08-07 15:20:47 -04:00
Arjun Singh
f004f5febb
Cleaning up javascriptinput setup method
2012-08-07 15:18:30 -04:00
Bridger Maxwell
98d4d44e45
Fixed test from previous commit.
2012-08-07 14:49:00 -04:00
Bridger Maxwell
735488fa51
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-07 14:40:37 -04:00
Bridger Maxwell
638a5059da
Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database.
2012-08-07 14:34:05 -04:00
Bridger Maxwell
f872e41d1d
Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.
2012-08-07 13:43:30 -04:00
Arjun Singh
26f31324c4
Moving a few static files out of lms into common
2012-08-07 13:39:59 -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
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
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
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
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
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
0c4ad3b152
Converting seed to str to allow for using Mock objects as a seed during tests.
2012-08-07 04:30:19 -04:00
Arjun Singh
332dd8c99e
Adding tests for javascript response; required copying files that would exist in other places in the main LMS to test_files because the test environment is fragile. This tests the code, but not the environment.
2012-08-07 04:29:45 -04:00
Arjun Singh
7cd8ffff3d
Cleans up node calls and (barely) improves security as subprocess.Popen will escape arguments properly. This means that instructors cannot set the grader/generator to ;/bin/rm -rf *; however, the python and node environments are not sandboxed at all and so instructors can still run arbitrarily malicious code.
2012-08-07 03:55:01 -04:00
Arjun Singh
fb6dbb120e
Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.
2012-08-07 03:28: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
