Bill DeRusha
a776733d51
Merge pull request #13638 from edx/bderusha/utm-tracking
...
Add UTM tracking for registrations
2016-10-07 17:45:43 -04:00
Nimisha Asthagiri
010f7eb5c8
Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies
...
Decouple student's dependency on badges with django signals
2016-10-07 13:44:11 -04:00
Bill DeRusha
9877c6ad6e
Add UTM tracking for registrations
...
Add UTM cookie tracking for registrations.
Add config model for cookie names.
ECOM-5539
2016-10-07 10:27:57 -04:00
Nimisha Asthagiri
1717e0c4f6
Decouple student's dependency on badges with django signals.
2016-10-06 18:13:37 -04:00
John Eskew
3614eb2800
Move xmodule_django app to openedx.core.djangoapps
2016-10-06 14:50:40 -04:00
Nimisha Asthagiri
5822919549
Cache Enrollment state for (user, course) in request cache.
2016-09-12 15:56:03 -04:00
Awais Jibran
98f01ebc56
Add logging to better monitor and determine root cause for email sending failures.
2016-09-02 16:10:45 +05:00
Syed Hassan Raza
3c9b399314
Handle MultipleObjectsReturned exception for dashboardpage
2016-08-15 17:58:20 +05:00
Saleem Latif
8ae92901ef
1. Merge microsites into Comprehensive Theming
...
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
PaulWattenberger
aa078dfda2
Pwattenberger/sailthru enroll ( #12816 )
...
* Partial changes for purchase tracking
* Continued changes for purchase tracking
* Clean up code quality issues
* Clean up code quality issues
* Responses to code review
* Fix code quality flaged issues
* Fix code quality flaged issues
* Fix code quality flaged issues
* Fix problem processing sailthru_content cookie
2016-06-28 11:13:21 -04:00
Tasawer
3a984d3ca2
Make user enrollment more robust
...
ECOM-1730
2016-06-27 14:51:09 +00:00
Clinton Blackburn
8fa3bf327f
Merge pull request #12651 from edx/clintonb/single-logout
...
Added support for OpenID Connect single logout
2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265
Updated logout view
...
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.
ECOM-4610
2016-06-15 11:11:49 -04:00
Tasawer
eb3517c27e
Fixing IntegrityError happened on concurrent requests for course enrollment
...
ECOM-1730
2016-06-15 12:14:03 +05:00
Adam Palay
44636fe62d
fix variable ordering issue with error message
2016-06-14 14:39:07 -04:00
Clinton Blackburn
8ea3b62016
Added admin for UserAttribute model ( #12596 )
...
ECOM-4502
2016-05-31 18:22:18 -04:00
Clinton Blackburn
2fd9896ca1
Allowing profile image upload date to be blank ( #12601 )
2016-05-31 16:46:11 -04:00
Peter Fogg
0e66baf41f
Add referral tracking for new registrations.
...
ECOM-4325
2016-05-16 11:17:23 -04:00
John Eskew
33568cb409
Merge pull request #11988 from mitocw/fix/aq/cas_profile_not_found_mitocw#102
...
Fixed 500 error in case of user's profile not found when login/logout with CAS.
2016-04-05 15:31:48 -04:00
Amir Qayyum Khan
9220c4d8dd
Fixed 500 error in case of user's profile not found when login/logout with CAS
2016-04-05 22:49:05 +05:00
Amir Qayyum Khan
58bde7f301
Excluded admins, staff and coach of master course from max enrollment
2016-04-05 21:31:54 +05:00
Jonathan Piacenti
17ec12c650
Address platform final review notes.
2016-04-01 21:06:07 +00:00
Jonathan Piacenti
61c76771f8
Add completion and enrollment badges.
2016-04-01 10:13:08 -05:00
Eric Fischer
97ac2845c1
Fix for LoginFailure.MultipleObjectsReturned in is_user_locked_out (replay)
...
The get_or_create function is vulnerable to race conditions in MySQL, which can
cause the model LoginFailure to, in some cases, have more than one row for the
same user, breaking the login for that user.
Addinf functionality to expect and clean the error by deleting extra rows (by
oldest lockout date), leaving just one entry and allowing the user to login.
Replayed and squashed by @efischer19, initially commited by @laq
2016-02-25 12:03:28 -05:00
Peter Fogg
a7b1f79d3e
Better error logging for full courses during enrollment.
...
ECOM-3685
2016-02-11 09:54:15 -05:00
Zia Fazal
6e861f266b
Merge pull request #11352 from edx/ziafazal/WL-209
...
ziafazal/WL-209:Cert Social Sharing customization
2016-01-29 16:50:17 +05:00
Zia Fazal
463e8c82cf
Cert Social Sharing customization
...
changes after feedback from matte
2016-01-28 14:26:48 +05:00
Nimisha Asthagiri
08a2bc9620
Merge pull request #11358 from edx/release
...
Hotfix for MA-1981 and safe sessions
2016-01-27 15:53:20 -05:00
Nimisha Asthagiri
f3cb692472
Safe Session Cookies Middleware
2016-01-26 17:23:03 -05:00
Bill DeRusha
77668afa11
Update age calculation to be more conservative.
2016-01-26 13:19:51 -05:00
Bill DeRusha
39b5eccf67
Update isActive column in mailchimp upon activation
2016-01-04 13:00:31 -05:00
Peter Fogg
cb1aa0617d
Merge pull request #10966 from edx/peter-fogg/fa-support-tool
...
WIP for financial support tool.
2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c
Support tool for changing enrollments.
...
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.
ECOM-2825
2015-12-16 14:17:19 -05:00
Bill DeRusha
005e07cb95
Remove default course mode setting in enrollment api
2015-12-09 19:46:04 -05:00
Peter Fogg
497622d4b4
Switch default course mode to 'audit'.
...
ECOM-2972
2015-11-25 11:22:29 -05:00
Ahsan Ulhaq
bc64c66835
Refund Policy on Prof Ed Receipts
...
ECOM-2562
2015-11-24 17:42:09 +05:00
Ned Batchelder
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Usman Khalid
6cb62f2697
Rebase upgrade Django to v1.8.5
...
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Bill DeRusha
6123827ab1
Compare all refund dates in UTC
2015-11-02 20:00:06 -05:00
Bill DeRusha
1f77810fad
Add configurable refund window
...
Add configuration model for enrollment refunds.
Use order info from otto in refund window calculation
Delete dupe tests. Extend tests to include window tests
Move ecom client from lib to djangoapps in openedx
2015-10-30 09:01:53 -04:00
Zia Fazal
9bb6f6e88d
use a generic function check if entrance_exam is enabled or not
2015-10-22 16:45:19 +05:00
Ned Batchelder
322ca34b20
Remove pylint pragmas from "class Meta"
...
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Sarina Canelake
105d611cc9
Create distinct terms for gender, education sign up terms
2015-10-20 18:55:51 -04:00
Afeef Janjua
713689dffe
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
...
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated
2015-10-20 18:32:21 +05:00
Bill DeRusha
fe23052511
Merge pull request #9979 from edx/bderusha/boardman-traffic
...
Add IP to all python Segment tracking calls
2015-10-05 14:55:55 -04:00
Bill DeRusha
ca6633bd98
Add IP to all python Segment tracking calls
2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
2015-10-01 19:40:27 -04:00
Bill DeRusha
c721ff5a82
Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY
2015-09-24 11:49:03 -04:00
Bill DeRusha
ccc43cfe98
Add mailchimp list fields and config for new users
2015-09-22 10:24:24 -04:00
Tasawer
02d4606e57
Fixing IntegrityError happened on concurrent requests for course enrollment
...
ECOM-1730
2015-09-10 10:51:14 +00:00