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

174 Commits

Author SHA1 Message Date
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00
Bridger Maxwell
fd43e94318 If an problem was updated and had a new max score it wasn't recached. Now it is fixed. 2012-09-28 23:38:49 -04:00
David Ormsbee
7a6eedb3f1 Make it so we don't require HTTP basic auth to talk to the queue server 2012-09-27 19:02:34 -04:00
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -04:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00
Victor Shnayder
4481adb041 Track current chapter. 
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
 2012-09-05 16:15:53 -04:00
kimth
8c0780bcdc Adjust comments 2012-08-31 18:05:54 -04:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
Victor Shnayder
22aa325d83 Enable linking into the middle of sequences 
* add a url that has an extra /{position} at the end
* pass it through to get_module
 2012-08-30 16:37:40 -04:00
kimth
fb5501855c Merge master 2012-08-28 12:37:24 -04:00
David Ormsbee
231b8c6aa4 Merge pull request #548 from MITx/kimth/limit-queue-dos 
Kimth/limit queue dos
 2012-08-28 08:03:02 -07:00
Victor Shnayder
bd2374b6fe Remove trailing slash from ajax url in ModuleSystem 
* also add a check for valid location in modx_dispatch
 2012-08-28 10:22:08 -04:00
kimth
26051f9939 Waittime passed through ModuleSystem.xqueue 2012-08-27 19:39:33 -04:00
Victor Shnayder
9102c7609c Fix latent bug in access checks in get_module 
* All access checks now done for the "user" param, ignoring request.user
  - This matters for xqueue callbacks and for instructor view of student progress
* An effect of this change is that if a student couldn't see their own 'progress' tab,
  the course instructor won't be able to see it either
 2012-08-27 10:20:16 -04:00
kimth
25ea8b2990 Use LMS secret key to seed anonymizer 2012-08-25 09:18:10 -04:00
kimth
f7c87aa7a1 Anonymous student id is a property of ModuleSystem 2012-08-25 09:03:47 -04:00
kimth
1dcaf21f81 Send idhash 2012-08-25 07:57:17 -04:00
Victor Shnayder
7a6fa1dd41 Fix access control for impersonation case 
- only relevant in tests due to start dates
- still irritatingly intricate logic...
 2012-08-24 16:52:19 -04:00
Calen Pennington
f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url 2012-08-23 11:49:23 -04:00
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04:00
Victor Shnayder
365495521e Catch errors in module load 
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
 2012-08-22 12:58:46 -04:00
kimth
f83169f12d Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x 2012-08-21 17:54:21 -04:00
Victor Shnayder
f44d794e63 Add course_id to StudentModule 
* Update all uses.
 2012-08-21 15:01:54 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
Victor Shnayder
5f612c7819 Oops. Make modx_dispatch and xqueue callback work again. 
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
 2012-08-20 16:04:16 -04:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate 
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
 2012-08-20 09:26:16 -04:00
kimth
2f63a9b403 Limit number of files that can be uploaded at once 2012-08-19 20:12:01 -04:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
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