Commit Graph

2373 Commits

Author SHA1 Message Date
chrisndodge
789193ef10 Merge pull request #5166 from edx/cdodge/hotfix-disable-social-auth-for-white-labels
make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware
2014-09-10 16:52:57 -04:00
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
This reverts commit 371dfd6187.
2014-09-05 10:51:51 -04:00
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128"
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
2014-09-04 16:01:28 -04:00
Julia Hansbrough
0dea82e43e Analytics should use user.id not anon id 2014-09-04 09:03:55 -04:00
Renzo Lucioni
9219cbdca8 Fix 3rd party auth string interpolation, address design feedback 2014-09-03 10:51:34 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party
Facebook auth support.
2014-08-30 02:50:57 -04:00
Will Daly
5cc6455fe3 Merge pull request #5006 from edx/will/ecom-199
ECOM-199: Auto-registration bugfix
2014-08-29 16:33:20 -04:00
Julia Hansbrough
fd925e8970 Add server-side analytics logging for login
Also, removed the client-side analytics for logging in.
Ensures that analytics are collected for third-party-auth logins.
Fixed failing tests related to third-party-auth.
2014-08-29 19:49:42 +00:00
Will Daly
9d4bf89058 Exclude courses from the auto-registration A/B test 2014-08-29 08:24:04 -04:00
Waheed Ahmed
048984ba1d Fixed InvalidKeyError on change enrollment.
LMS-11132
2014-08-29 14:45:54 +05:00
Will Daly
3af9943de8 Bugfix for ECOM-199: Visitors removed from auto-enroll pool if they need to authenticate while attempting to enroll
Sets a session variable as soon as a user enters the experimental condition to ensure that they stay in that condition,
even if they later access the control URL (e.g. from a redirect on the login page)
2014-08-28 12:24:00 -04:00
Will Daly
fcc27003dc Pep8 and Pylint fixes to the student tests 2014-08-28 08:05:36 -04:00
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -04:00
Diana Huang
3d50f4c3a7 Merge pull request #4959 from edx/diana/set-cur-lang
Make sure that the currently-set language is the one that shows on the left sidebar if no language  preference exists.
2014-08-26 09:43:09 -04:00
Diana Huang
ff4fc7956e Make sure that the currently-set language is the
one that shows on the left sidebar if no language
preference exists.

ECOM-135
2014-08-25 17:12:29 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Renzo Lucioni
79461722de Re-use GA cookie when sending server-side events to Segment.io 2014-08-21 10:47:35 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
2014-08-15 10:26:27 -04:00
Diana Huang
d60907d725 Consider profession ed courses as paid courses.
ECOM-63
2014-08-12 18:45:22 +00:00
Diana Huang
83f7acffca Merge pull request #4764 from edx/diana/show-cert-without-end-date
Show Certificates Before End
2014-08-08 15:36:39 -04:00
Diana Huang
7865e2fb3c Move certificates_show_before_end into a new variable
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
2014-08-08 14:29:57 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Diana Huang
0d62895be4 Modify certificates_show_before_end_date behavior
Hide the certificate notification box when there's
no certificate information, even when the flag
certificates_show_before_end_date is turned on.

ECOM-11
2014-08-07 14:58:04 -04:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware.
LMS-6622
2014-08-06 19:58:20 +05:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35
Correct UnboundLocalError exception in student_migration_35
2014-08-05 18:26:45 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes
eCommerce enhancements (pt. 2)
2014-08-05 13:12:52 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
asadiqbal08
932010df59 refund message for purchased courses
Add little more logic for paid courses
2014-08-05 10:00:16 -04:00
Diana Huang
ec13aabe97 Fix up tests and enrollment behavior. 2014-08-05 09:32:39 -04:00
Diana Huang
604bfabb88 fixup! Allow verified to be offered without audit 2014-08-05 09:32:39 -04:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00
Jason Bau
e557b5debd Allow external_auth registrations to bypass PW complexity check 2014-07-28 15:17:17 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
njdup
770e7aac49 User registration prevents using password as username.
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
2014-07-21 14:04:48 -07:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Chris Dodge
bde448d950 make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list 2014-07-17 12:04:56 -04:00
Sarina Canelake
405c4f9eb3 Merge pull request #4244 from Stanford-Online/jbau/edx/course-specific-login-opaquekeys
course_specific_reg/login for OpaqueKeys
2014-07-16 12:45:39 -04:00
Jason Bau
e9022e74a8 Hotfix course_specific_reg/login for OpaqueKeys 2014-07-16 10:18:21 -04:00
Don Mitchell
9f2fa7e105 sql migrations cannot use loc mapper 2014-07-16 09:21:25 -04:00
Chris Dodge
8516c0dbff add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob
fix broken unit test

add some unit tests
2014-07-14 09:36:28 -04:00
asadiqbal08
ce7e625c3b Update the UserSignUpSource model 2014-07-14 12:36:00 +05:00
Mat Peterson
4f6088cbd1 Fixed some isinstance errors with opaque-keys 2014-07-11 15:40:08 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting.
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split.
LMS-2950 move delete_course to Mongo.
2014-07-09 21:10:12 -04:00