kimth
9acb1ddaca
Hide chapters in addition to sections
2012-08-16 15:06:49 -04:00
kimth
3c1e67e339
Merge master
2012-08-15 15:19:08 -04:00
kimth
02d970c31e
Map '/course/' urls to the course's root in the multicourse hierarchy
2012-08-15 14:45:12 -04:00
kimth
0b4b8ecfdc
courseware.get_module passes down course_id triplet (org, course, run)
2012-08-15 14:20:35 -04:00
Calen Pennington
4b2c4e71d2
Merge pull request #414 from MITx/kimth/xqueue_callback_blocking
...
Rename acquire_lock to select_for_update, add docstring
2012-08-15 07:44:50 -07:00
kimth
42ea4f3271
Rename acquire_lock to select_for_update, add docstring
2012-08-15 10:13:35 -04:00
Calen Pennington
b2df6d9456
Merge pull request #412 from MITx/feature/victor/start-dates
...
LMS internal auth refactor and start dates
2012-08-15 05:24:34 -07:00
Victor Shnayder
5d9fad5a52
Minor cleanups before pull request
2012-08-14 23:30:38 -04:00
Victor Shnayder
e4fb9ec63a
Remove is_staff from ModuleSystem
...
- now handling access control via get_module
2012-08-14 23:30:37 -04:00
Victor Shnayder
b782e2ff5d
Make start dates work for all modules
...
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
2012-08-14 23:30:37 -04:00
Victor Shnayder
2df3a6ef11
Big access control refactor
...
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
- possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access
Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
2012-08-14 23:30:37 -04:00
Rocky Duan
449d665b00
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-14 17:48:08 -07:00
kimth
75eee443ff
Xqueue callback acquires lock on StudentModule to avoid race condition
2012-08-14 18:13:53 -04:00
Rocky Duan
eb47093b1c
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
common/djangoapps/student/models.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-14 12:54:43 -07:00
Calen Pennington
814f55aad0
Fix the name of HTTPBasicAuth
2012-08-14 12:45:34 -04:00
Calen Pennington
6e88777126
Import HttpBasicAuth from the right place
2012-08-14 12:34:25 -04:00
Calen Pennington
8ce12b10b2
Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand
2012-08-14 12:32:52 -04:00
Calen Pennington
c4bed2c128
Add basic authentication support for requests made to the xqueue server
2012-08-14 11:59:47 -04:00
Calen Pennington
91b6bb649c
Move queue interface url and auth into configuration, rather than hardcoding it
2012-08-14 11:59:46 -04:00
kimth
1c2d034283
LMS-side MAX_FILESIZE set in settings.py
2012-08-13 21:17:47 -04:00
kimth
936f2c49f5
Server-side (LMS) checking of uploaded filesize
2012-08-13 21:00:29 -04:00
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
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
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
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
Mike Chen
2b803b024e
fix MITx master bug in courseware.
2012-08-08 12:02:50 -04:00
Mike Chen
5e6261ebb1
courseware still not working..
2012-08-08 11:30:11 -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
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
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
Rocky Duan
0ae68e7324
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-06 22:38:31 -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
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
Calen Pennington
24f85bf202
Merge pull request #340 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-06 12:17:15 -07:00
ichuang
9805ed8962
cleanup syntax, split long if into two lines
2012-08-06 14:37:17 -04:00
kimth
6c875206bc
Simplify file submission front end
2012-08-06 12:44:19 -04:00
