ichuang
2e4f21ee3b
replace_static_urls should only be run once (currently twice, eg if
...
html is in a veritical)
2012-08-10 15:25:41 -04:00
Calen Pennington
c867560662
Merge pull request #385 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-10 12:19:36 -07:00
Tom Giannattasio
f2012e1d2a
additional processing class
2012-08-10 15:07:08 -04:00
Tom Giannattasio
185ab1f615
added spinner class and image
2012-08-10 14:22:34 -04:00
Victor Shnayder
feba37cf78
respond to comments on merge
2012-08-10 13:39:58 -04:00
Victor Shnayder
67949f8a32
Fix metadata inheritance
...
* with xml datastore, re-do all inheritance once the whole course is loaded
2012-08-10 13:15:14 -04:00
kimth
f6b2cabd83
Position change in sequence kills polling thread, rather than new Problem creation
2012-08-10 13:10:53 -04:00
kimth
64eba4332c
Remove temp xqueue url
2012-08-10 12:01:53 -04:00
kimth
36091697a5
Student browser polls for queued submission result
2012-08-10 11:59:45 -04:00
Victor Shnayder
6882b4b53d
responding to review comments on #383
2012-08-10 11:42:54 -04:00
Victor Shnayder
1d8dcf30f9
docstring cleanups
2012-08-10 11:42:53 -04:00
Victor Shnayder
5882a89c82
Add management command to create random users
...
* required some refactoring in create_account() view
2012-08-10 11:41:05 -04:00
Calen Pennington
5f44b08f9c
Merge pull request #382 from MITx/feature/victor/check-access-control
...
Did a quick security scan through views.
2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837
Did a quick security scan through views.
...
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
2012-08-10 10:43:20 -04:00
Calen Pennington
4f27dd436e
When in debug mode, check the staticfiles.finders before mangling urls
2012-08-10 10:13:18 -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
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
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
Bridger Maxwell
a9d67c3e8d
Added has_score attribute to xmodule, for problem-like xmodules.
2012-08-07 15:20:47 -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
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
