Calen Pennington
801df37872
Merge remote-tracking branch 'origin/master' into arjun/javascript_response
...
Conflicts:
common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/module_render.py
2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b
Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches
...
Provide content QA (quality assessment) interface
2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d
Merge pull request #397 from MITx/feature/server_split
...
Model replication to course databases
2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975
Merge branch 'master' into feature/server_split
...
Conflicts:
lms/urls.py
2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f
Merge pull request #394 from MITx/feature/victor/hide-error-modules
...
Hide errors from non-staff users
2012-08-13 06:17:13 -07:00
David Ormsbee
c6ed6fc066
Merge branch 'master' into feature/server_split
2012-08-13 00:36:31 -04:00
Victor Shnayder
3455f8f64d
Hide errors from non-staff users
2012-08-12 18:03:12 -04:00
Victor Shnayder
d7f94a05b7
Add DARK_LAUNCH functionality
...
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date. Students still can't.
* tests.
* Remaining: enrollment view has custom access control. Need to check it.
2012-08-12 16:23:31 -04:00
Victor Shnayder
622eebc473
Don't error on missing static files
...
* Just log a warning and return a dummy url
* May want smarter checking later
(e.g. would be nice to tell staff what files are missing.)
2012-08-12 16:21:38 -04:00
ichuang
da64c8f0a1
add xqa interface to staff_problem_info, make staff_debug a modal
...
window, add xqa modal window, add xqa_key to course metadata
2012-08-11 20:12:37 -04:00
kimth
d41f709c92
Moved xqueue_callback URLs into the course
2012-08-10 18:51:35 -04:00
ichuang
411e77e19d
ModuleSystem should get its DEBUG set from settings.DEBUG in module_render
2012-08-10 15:25:42 -04:00
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
Victor Shnayder
6882b4b53d
responding to review comments on #383
2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2
make the tests work around the 404 bug
2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd
In-progress auth tests
...
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45
ensure float when computing module score
2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0
Add instructor dashboard
...
* dashboard links to gradebook and dummy grade summary page
2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02
Fix links to student profile pages from gradebook
2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774
Only show enrolled students in course gradebook
...
* also added todo about need for pagination
2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f
Remove noisy debug message
...
* also adds a comment to lms/urls.py
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
David Ormsbee
0d824c6c02
Move modx_dispatch URL calls into the course
2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a
Make accordion remember state
...
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -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
kimth
58a1248d32
New external grader format: JSON-serialized dict
2012-08-09 08:29:12 -04:00
Bridger Maxwell
e4329c312d
Fixed log of error. Xmodules don't have ids, so I log the location instead.
2012-08-08 16:03:28 -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
Matthew Mongeau
0b03834f51
XML based table of contents for books.
2012-08-08 14:13:20 -04:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Bridger Maxwell
696804da13
Changes from pull request comments.
2012-08-08 10:28:40 -04:00
Bridger Maxwell
ec04b0cb13
Changed yield_module_descendents to be stack-based, so it plays nicer with the profiler.
2012-08-07 16:16:31 -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
Bridger Maxwell
a9d67c3e8d
Added has_score attribute to xmodule, for problem-like xmodules.
2012-08-07 15:20:47 -04:00
David Ormsbee
f4138cae70
re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE
2012-08-07 15:01:12 -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
kimth
a9a19f40c3
Merge master
2012-08-07 11:51:44 -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
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
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
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
Bridger Maxwell
4fedca5bf9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
Bridger Maxwell
baa2b14405
Changed interface of StudentModuleCache. Other changes from code review.
2012-08-06 16:36:53 -04:00
kimth
4e6808bb47
Merge master
2012-08-06 16:26:25 -04:00
kimth
41e7d72ea8
Xqueue interface is embedded in ModuleSystem
2012-08-06 16:13:35 -04:00
