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
David Ormsbee
b31722bcff
Merge branch 'master' into feature/bk_forum_int
2012-08-21 12:05:06 -04:00
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07: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
kimth
eaef8c70a7
Lowercase
2012-08-20 18:51:34 -04:00
kimth
7e7247d8bf
Don't tabulate hidden chapters and sections in the Progress view
2012-08-20 18:47:18 -04:00
Rocky Duan
8684ae29b2
Merge branch 'master' of github.com:MITx/mitx into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 15:31:51 -07: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
Calen Pennington
259e21364f
Merge pull request #461 from MITx/feature/victor/multi-run-policy
...
Keep each course's descriptors separate
2012-08-20 12:35:55 -07:00
Bridger Maxwell
9bc5aec01a
Fixed up courseware-error view. Moved it to templates/courseware too.
2012-08-20 15:03:55 -04:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
Bridger Maxwell
70c7ee42ed
Fixed tests from profile->progress rename.
2012-08-20 14:08:42 -04:00
Bridger Maxwell
92a293f07e
Removed profile info from Profile page and renamed it to Progress.
2012-08-20 13:50:28 -04:00
Victor Shnayder
f2197227c1
add out-of-date message to check_course
2012-08-20 09:26: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
Calen Pennington
b0627efc74
Fix the tests of the book url
2012-08-17 09:23:37 -04: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
Calen Pennington
3b36fbf914
Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore
2012-08-16 12:49:42 -04:00
kimth
909a368f4a
Merge branch 'master' into kimth/xqueue_callback_blocking
2012-08-16 11:27:56 -04:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
