Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

5216 Commits

Author SHA1 Message Date
Victor Shnayder
1d8dcf30f9 docstring cleanups 2012-08-10 11:42:53 -04:00
Bridger Maxwell
45baccae85 Added a django template loader that can return Mako templates. Started pulling in new wiki. 2012-08-10 11:31:29 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Calen Pennington
ecbb0ee39a Merge pull request #373 from MITx/MITx/feature/bridger/fast_course_grading 
Make templates render on non-xml modulestores
 2012-08-09 10:41:19 -07:00
Victor Shnayder
298954fc01 Clean up customtag handling 
* load the template at descriptor init
* make it  export inline, not as a pointer
* update import/export test to do export to initial directory
 2012-08-09 13:32:57 -04:00
Calen Pennington
4e5af13d52 Merge pull request #374 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-09 09:11:21 -07:00
kimth
062eff12c4 Remove test url of xqueue 2012-08-09 12:06:36 -04:00
kimth
6b1bf0d4ca Fix tests with new score_msg format 2012-08-09 12:05:34 -04:00
kimth
e47ff641f3 Testing new instances of xqueue 2012-08-09 11:57:59 -04:00
Calen Pennington
f2c8d5b427 Merge pull request #364 from MITx/MITx/feature/bridger/fast_course_grading 
Even Faster Course Grading
 2012-08-09 07:49:19 -07:00
Victor Shnayder
9867dceca5 Load templates at descriptor load 
* instead of being lazy
 2012-08-09 10:47:08 -04:00
Victor Shnayder
9d87710f59 Revert "Lazily loading capa problems (for faster grading)." 
We don't want lazyness, and will save the proper fix (moving work into descriptor load for later)
 2012-08-09 10:31:48 -04:00
kimth
e3ed383888 Move old externalresponse XML parser into subfunction, fix correctness bug (should be correct/incorrect not True/False) 2012-08-09 09:41:27 -04:00
kimth
58a1248d32 New external grader format: JSON-serialized dict 2012-08-09 08:29:12 -04:00
Kyle Fiedler
c3cd858e4b Remove black bars for video 2012-08-08 16:27:48 -04:00
Kyle Fiedler
23e52f02c3 Fix odd movement on hover for the next button on hover 2012-08-08 16:27:48 -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
Rocky Duan
2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/urls.py
 2012-08-07 16:58:14 -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