ichuang
2efe481237
move instructor dashboard into its own lms djangoapp; add new
...
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
David Ormsbee
877ae91b7f
Don't show View Courseware buttons if they don't have access to load the courseware
2012-08-31 21:50:33 -04:00
Arjun Singh
9eecd43a4a
Fix jump to courseware test to expect a redirect
2012-08-31 17:49:15 -07:00
David Ormsbee
69ea7aa873
Merge pull request #597 from MITx/feature/victor/nested-links
...
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
David Ormsbee
04439a3217
add comments explaining prefetch need
2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209
Prefetch user groups to speed up auth checks required to render Progress page view for students
2012-08-31 15:16:31 -04:00
Arjun Singh
32cb0897e9
Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index.
2012-08-31 04:24:52 -07:00
Victor Shnayder
d815d50aee
Remove obsolete eager flag for xml modulestore
...
* has to be eager
2012-08-30 19:26:50 -04:00
Victor Shnayder
021ccde1b4
Make jump_to work with the xml modulestore
...
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
2012-08-30 18:47:11 -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
5ba76a505f
Merge pull request #572 from MITx/feature/arjun/fix_progress_scores_order
...
Fixing order that problem scores are displayed on the progress page
2012-08-28 08:06:32 -07: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
Arjun Singh
3842c39f8a
Fixing order that problem scores are displayed in
2012-08-27 23:52:27 -07:00
kimth
26051f9939
Waittime passed through ModuleSystem.xqueue
2012-08-27 19:39:33 -04:00
Victor Shnayder
1e72e1c91e
change 404 message
2012-08-27 16:24:43 -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
David Ormsbee
955dc94711
Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view
...
Set request.user = student when impersonating a student
2012-08-25 08:39:46 -07: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
kimth
115eebdb76
Use reverse for course_info url replacement
2012-08-24 16:47:50 -04:00
Victor Shnayder
b8659e084c
Set request.user = student when impersonating a student
...
* currently only in the staff view of student progress page
[Fix #34379687 ]
2012-08-24 16:30:16 -04:00
kimth
31216ccd9f
Do URL replacement in course info page
2012-08-24 16:16:26 -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
David Ormsbee
baa6eadfb5
Merge branch 'master' into feature/dave/forum_fixes
2012-08-22 20:30:49 -04:00
Victor Shnayder
1b25433a39
Allow error-template-rendering errors to propagate to top-level 500 handler
...
* hopefully won't come up, but if they do, our 500 page
should be better than HttpResponse("There was an unrecoverable error")
2012-08-22 20:21:10 -04:00
Rocky Duan
908a5c5d59
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 14:11:44 -07:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
David Ormsbee
fafbe41644
Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack
...
Enrollment hack for allowing Berkeley to add their students.
2012-08-22 13:59:07 -07:00
Piotr Mitros
69a3ea63bc
Fixed minor issues (removed two unnecessary lines)
2012-08-22 16:32:14 -04:00
Piotr Mitros
a301abd5ad
Enrollment hack for allowing Berkeley to add their students.
2012-08-22 15:49:48 -04:00
Calen Pennington
82bab71ccf
First pass at branding the header logo on subdomains
2012-08-22 14:05:19 -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
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
David Ormsbee
f7539e8bce
Merge pull request #488 from MITx/kimth/fix-choiceresponse
...
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 15:46:32 -07:00
kimth
f83169f12d
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 17:54:21 -04:00
Victor Shnayder
2c19d01441
Merge pull request #479 from MITx/feature/arjun/syllabus
...
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
Arjun Singh
02ecfb4730
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:25:29 -07:00
Arjun Singh
b86fbdbd10
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:23:00 -07:00
Calen Pennington
99f94b0a6b
Merge pull request #472 from MITx/feature/victor/per-course-progress
...
Feature/victor/per course progress
2012-08-21 12:29:03 -07:00
Bridger Maxwell
9cc72c4965
Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.
2012-08-21 15:02:27 -04:00
Victor Shnayder
d13998a135
add docstring comment
2012-08-21 15:02:27 -04:00
Victor Shnayder
ec90200b81
fix migration to remove out of date index
...
* reorder index fields
2012-08-21 15:02:26 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07:00
Victor Shnayder
b97a2af2a2
Show policy, grading policy, and top-level errors
...
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
2012-08-21 15:00:21 -04:00
