Jane Manning
c976fee2d9
Copy changes to make dup email or public-username messages more informative
2013-05-28 15:32:53 -07:00
Calen Pennington
f521b8e8c0
Handle errors while sending emails around changing user data
...
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.
Fixes JIRA LMS-131
2013-05-23 10:27:34 -04:00
Greg Price
d4cee365e6
Ensure CSRF cookie is present for login and registration pages
2013-05-17 14:23:28 -04:00
Greg Price
7d544d449f
Remove edX news from dashboard if marketing site is enabled
2013-05-10 11:03:49 -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
Greg Price
f8539cc2d7
Redirect authenticated users from registration or login to dashboard
2013-05-08 17:10:54 -04:00
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
Diana Huang
3e217c8f85
Use new login page for marketing site when student is trying to
...
access login_required page.
2013-05-03 15:04:41 -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
Victor Shnayder
aae40b4378
Press updates
...
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
Diana Huang
886e74342d
Move the testcenter login to external_auth
...
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
2013-04-25 11:12:19 -04:00
Calen Pennington
6c7c49e6bd
Fix pep8 violations
2013-04-17 11:07:58 -04:00
John Jarvis
0c1fd783cb
Setting the edxloggedin cookie on registration
...
Previously it was only set for login
2013-04-11 10:44:22 -04:00
John Jarvis
2b309adf9c
Fixing cookie handling for edx-mktg-loggedin
2013-04-09 13:26:57 -04:00
Brian Talbot
78079d1ca7
Merge branch 'master' into drupal-new
2013-04-08 22:35:29 -04:00
David Ormsbee
6e3d9608b4
Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error
...
An integrity error while creating an enrollment just means that our work...
2013-03-27 12:03:26 -07:00
Calen Pennington
122c8567c5
An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947
2013-03-27 15:00:08 -04:00
Will Daly
15ea32b095
Fixed bug 294, caused by unicode encoding error when creating logging
...
strings.
Added unit tests that verify the fix.
2013-03-27 12:53:58 -04:00
John Jarvis
ae81009a43
Changing edx marketing site cookie value to 'true'
2013-03-21 17:56:56 -04:00
John Jarvis
57dd2e728c
Adding a new cookie to determine logged in status for the edx mktg site
...
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
2013-03-21 17:17:35 -04:00
Chris Dodge
63fc2eecaf
drive by fix to get proper error handling
2013-03-21 16:32:58 -04:00
John Jarvis
01d95b7ebe
fixing merge issues
2013-03-19 16:24:23 -04:00
John Jarvis
63d85a52dc
fixing merge issues
2013-03-19 16:22:36 -04:00
John Jarvis
78987cc400
resolving merge conflicts
2013-03-19 16:16:32 -04:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
David Ormsbee
a00f11c1ff
Tell user that spaces aren't allowed in usernames (requested by Teppo).
2013-03-04 11:17:29 -05:00
Ned Batchelder
7c8a90229e
Use 'is None' and 'is not None'
2013-03-04 10:57:25 -05:00
Calen Pennington
3d36736cf3
Limit remembered logins to 7 days, so that old cookies will eventually expire
2013-02-21 09:05:19 -05:00
John Jarvis
fd36c555a6
Renaming login url for modal-less login
2013-02-19 19:36:32 -05:00
John Jarvis
4596fa417f
Changing login and signin view names
2013-02-19 17:31:22 -05:00
John Jarvis
dabcb51746
resolving merge conflicts
2013-02-19 12:43:06 -05:00
Calen Pennington
bd822b9d2f
Fix tests post-merge
2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Brian Wilson
2a1c89bec5
change missingExamSeriesCode to missingPartnerID
2013-02-09 02:24:51 -05:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Brian Wilson
ab6f383be1
support for Pearson test user
2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f
for starting pearson exam, just call jump_to() instead of reverse(jump_to...)
2013-02-08 02:15:45 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
John Jarvis
0f39e04697
Adding certificate restriction lookup
...
If certificate status is 'restricted' the grade
and survey link will be shown, the download link will not
2013-01-29 10:27:53 -05:00
John Jarvis
4af2e1118a
Changing login and register to login_user and register_user
2013-01-23 18:44:26 -05:00
John Jarvis
d2e130ab33
Removing extra parens
2013-01-23 18:42:35 -05:00
John Jarvis
64f0855055
Adding removed code from master rebase
2013-01-23 18:41:17 -05:00
