Greg Price
7dd2973eca
Return 404 for course about pages if the marketing site is enabled
...
It would be better to redirect to the marketing site course about pages, but
the URLs for those are not easily computed, and we do not have time to set up
a full mapping in the LMS config.
2013-05-10 11:03:16 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
John Jarvis
0b7af27b4b
be more forgiving about the iframe url
...
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
2013-05-07 16:00:00 -04:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Jay Zoldak
2ffaea7ade
Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
...
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
jarv
f18321cda2
Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
...
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07:00
John Jarvis
d69bbf272e
using new template for "coming-soon"
2013-05-06 12:30:18 -04:00
John Jarvis
424d295686
syntax errors
2013-05-06 12:00:46 -04:00
John Jarvis
e852574a17
adding 404 handling for courses that do not exist
2013-05-06 11:54:09 -04:00
Ned Batchelder
7cb3987f94
Ugh, missing import.
2013-05-06 11:39:21 -04:00
Ned Batchelder
d8c22dbeb3
Add a Django setting for course allowed to run unsafe code.
2013-05-06 11:39:21 -04:00
Will Daly
7b26c50e32
Added instructions for clearing the cache before running tests
2013-05-06 11:39:20 -04:00
Will Daly
ac660ead3e
Added load test of CustomResponse
2013-05-06 11:39:20 -04:00
Ned Batchelder
5e7d328e7f
Use the Django cache for sandboxed code execution.
2013-05-06 11:39:19 -04:00
Ned Batchelder
ceb6cedaae
Fix merge
2013-05-06 11:39:19 -04:00
Ned Batchelder
249ba4be33
Finish the test for computed_answer
2013-05-06 10:55:04 -04:00
Ned Batchelder
a6677aa0a8
Computed answers are run through safe_exec.
2013-05-06 10:55:04 -04:00
Ned Batchelder
6297d64528
Now these can be in the same test class
2013-05-06 10:55:04 -04:00
Ned Batchelder
ff1df569cb
Refactor submitting problems so we don't need custom code for each test.
2013-05-06 10:55:04 -04:00
Ned Batchelder
33abe54e0d
Work in progress to sandbox the uses of eval in LMS.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9249bafd00
Add a test of a bad answer also.
2013-05-06 10:55:03 -04:00
Ned Batchelder
e69a073161
Add a test for the Python in schemaresponse, and refactor the tests while I was in there.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9827a0e218
Oops, this line can go too.
2013-05-06 10:55:03 -04:00
Ned Batchelder
9cc43f1d9b
Simplify this test setup.
2013-05-06 10:55:03 -04:00
jarv
bf5ac6c263
Merge pull request #1950 from edx/jarv/drupal-new/iframe
...
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Jay Zoldak
8ef88fa5b0
Fix tests that randomly fail when run in concurrent jobs on jenkins.
2013-05-06 10:24:38 -04:00
Greg Price
e5846e64bd
Modify course registration flow for new login and registration pages
...
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
John Jarvis
01f8c4c816
Adding iframe view
...
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
2013-04-30 09:44:21 -04:00
ichuang
977eb6530c
allow staff to toggle masquerade on info pages (otherwise can get
...
blocked from courseware pages, if course hasn't started yet)
2013-04-21 21:43:18 -04:00
ichuang
f1a899ac1c
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
2013-04-20 12:25:47 -04:00
ichuang
81621fbe3a
for staff masquerading as student be kind and don't 404 for inaccessible content
2013-04-20 12:12:25 -04:00
ichuang
6cbd353992
make masquerade work properly even if DISABLE_START_DATES true
2013-04-20 11:57:56 -04:00
Jay Zoldak
be76f73107
Consolidate and upgrade factories
2013-04-18 15:11:10 -04:00
ichuang
0ffc399f7d
move masquerade call up, to make sure it is used for start date checks
2013-04-17 22:12:12 -04:00
Will Daly
b42c4dacf7
Added test for "radio" choicegroup
2013-04-17 15:32:39 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
ichuang
5f74ccd1a0
use ENABLE_MASQUERADE in masquerade.py
2013-04-13 22:52:17 -04:00
ichuang
5ca0393e05
add test for masquerade
2013-04-13 22:47:49 -04:00
ichuang
1c2452e401
make is_masquerading_as_student work with Mock for tests
2013-04-13 22:47:34 -04:00
ichuang
857a6e0bd0
pylint masquerade fixes
2013-04-13 22:47:28 -04:00
ichuang
fdfc37e4e3
masquerade pep8
2013-04-13 22:47:21 -04:00
ichuang
af3e08e8c7
masquerade link in courseware/views.py
2013-04-13 22:47:15 -04:00
ichuang
168a3aadf6
masquerade - remove debug line, careful with ifs in course_nav.html
2013-04-13 22:46:55 -04:00
ichuang
fb0a23238a
allow staff to masquerade as student - works
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/course_navigation.html
2013-04-13 22:46:39 -04:00
ichuang
c905cc7416
add masquerade.py
2013-04-13 22:46:30 -04:00
Jay Zoldak
d8c186d3a1
fix pylint errors in test_login.py
2013-04-12 10:25:12 -04:00
