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

343 Commits

Author SHA1 Message Date
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
Calen Pennington
7ef6132194 Make factories return unicode data 
Django always returns string data from the database as unicode objects
(ref: https://docs.djangoproject.com/en/1.4/ref/unicode/#models).
Therefor, our factories should do the same
 2013-05-22 21:38:07 -04:00
Calen Pennington
2add58bb5a Create sequences for names, emails, and usernames in UserFactory 2013-05-22 21:35:49 -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
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -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
0f7378a171 Modify UserFactory to create a profile for the user 
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
 2013-05-03 10:31:35 -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
Jay Zoldak
be76f73107 Consolidate and upgrade factories 2013-04-18 15:11:10 -04:00
Jay Zoldak
0426761bed Update lettuce and factory-boy versions. 2013-04-18 10:18:36 -04:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38: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
cddc868656 Login URL resolves differently in LMS and CMS, which breaks login_test 
when loaded by rake test_cms

I moved the test into lms/courseware/tests so they run correctly.
 2013-03-27 13:01:10 -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
Carlos Andrés Rocha
4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates 
In sign up form, merge PhD-science and PhD-other, add Associate's degree
 2013-03-21 14:35:16 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -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
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Jay Zoldak
1c4ffcf122 Fix import statement for test.py 2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad Factory refactor working for lms lettuce tests. 2013-03-20 09:38:52 -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
8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 12:00:10 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -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
David Ormsbee
11f864f489 Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime 
Limit remembered logins to 7 days, so that old cookies will eventually expire
 2013-03-01 11:37:46 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -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