Simon Chen
b47a6d592f
ECOM-3415 make sure all the xseries programs associated with a course is displayed
2016-03-03 08:42:14 -05:00
Michael Frey
5903ef832c
Merge pull request #11584 from edx/release
...
Merging release back to master
2016-02-18 14:55:25 -05:00
Bill DeRusha
b686abc18d
Disable mailchimp integration for most segment identify requests
2016-02-17 17:10:48 -05:00
Toby Lawrence
0d040bc051
Fix a mistake with initializing something in the test setup.
2016-02-16 10:20:57 -05:00
Toby Lawrence
e2ed8ff787
Switch to SharedModuleStoreTestCase in the 'student' app where possible.
2016-02-08 14:13:57 -05:00
Douglas Hall
37a7fdc0f2
Added subsection gating feature
2016-01-28 14:05:20 -05:00
Ahsan Ulhaq
5181513629
Show message for earned programs credentials
...
ECOM-3015
2016-01-28 13:05:50 +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
Bill DeRusha
f59144b7e3
Merge pull request #11207 from edx/bderusha/yob-fix
...
Update age calculation to be more conservative.
2016-01-27 10:48:47 -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
Adam Palay
c37715a7c7
Merge remote-tracking branch 'origin/release' into merge-release-into-master
...
Conflicts:
requirements/edx/base.txt
requirements/edx/github.txt
2016-01-26 11:25:41 -05:00
Adam Palay
bb2d75d80e
Revert "Merge pull request #11241 from edx/feature/credentials-phase-1"
...
This reverts commit 46df454536039e6cdfe6
2016-01-25 12:46:57 -05:00
Zia Fazal
c0648ab164
moved IS_EDX_DOMAIN dependent feature to edx.org theme
2016-01-22 15:32:19 -05:00
Ahsan Ulhaq
46df454536
Merge pull request #11241 from edx/feature/credentials-phase-1
...
Feature/credentials phase 1
2016-01-22 18:39:53 +05:00
Braden MacDonald
5e3cc70783
Merge pull request #10943 from open-craft/email-authorized-list-master
...
Allow each instance to configure restrictions on allowed email addresses
2016-01-20 14:51:29 -08:00
Braden MacDonald
110714ee81
Allow each instance to configure restrictions on allowed email addresses
2016-01-20 11:03:30 -08:00
Mushtaq Ali
d8b902ad58
Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg
...
Escape Course Name in enrolment message
2016-01-20 20:04:23 +05:00
Mushtaq Ali
8f76f3385a
Fix enrollment message
2016-01-20 15:59:27 +05:00
Ahsan Ulhaq
4ce58a6f67
Show message for earned programs credentials
...
ECOM-3015
2016-01-20 12:50:30 +05:00
AlasdairSwan
2676098b02
ECOM-2967 adding GA events for dashboard XSeries messages
2016-01-14 12:37:48 -05:00
Adam
e8925972d9
Merge pull request #11168 from edx/adam/fix-userstanding-page
...
userstanding is now OneToOneField
2016-01-08 13:36:54 -05:00
Adam Palay
7dc54723d3
userstanding is now OneToOneField
2016-01-07 15:11:23 -05:00
Bill DeRusha
39b5eccf67
Update isActive column in mailchimp upon activation
2016-01-04 13:00:31 -05:00
Matt Drayer
115b169259
mattdrayer/SOL-1519: Include course-level configuration in feature check
2015-12-13 09:57:29 -05:00
Clinton Blackburn
27f853d605
Followup to Credit Patch
...
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields
ECOM-2893
2015-12-11 15:53:18 -05:00
Zia Fazal
4f939f79f9
added new endpoint which renders certificate by uuid
...
fixed broken tests and added some optimisations
fixed migration history
2015-12-08 18:21:04 +05:00
Christine Lytwynec
b490bd168a
Merge pull request #10832 from edx/clytwynec/auto-auth-redirect
...
Clytwynec/auto auth redirect
2015-12-07 15:56:23 -05:00
Christine Lytwynec
df638088ca
pr fixes
2015-12-07 14:21:00 -05:00
Christine Lytwynec
9f5273a7d1
pr fixes
2015-12-07 11:50:41 -05:00
Christine Lytwynec
3b217df917
add new tests for auto_auth redirecting
2015-12-04 15:04:42 -05:00
Peter Fogg
8b97ca1b24
Merge pull request #10802 from edx/feature/remove-honor-code-certs
...
Remove default honor code.
2015-12-03 14:55:30 -05:00
Bill DeRusha
4b94d6367a
Update dashboard banners and track selection for audit track
...
Remove cert messaging from audit cert/grade info partial
move enrollment display method to helpers
2015-12-03 13:22:08 -05:00
Renzo Lucioni
70d57327eb
Add Programs tab to Studio
...
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
2015-11-25 14:56:50 -05:00
Peter Fogg
497622d4b4
Switch default course mode to 'audit'.
...
ECOM-2972
2015-11-25 11:22:29 -05:00
Ned Batchelder
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Chris Dodge
02550cb368
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-13 12:57:10 -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
Eric Fischer
24ee5a68f5
Merge pull request #10490 from edx/release
...
Release 4 November 2015 to master
2015-11-04 13:19:09 -05:00
Eric Fischer
dc469ea5ec
Fix cert_status None. Add GeneratedCertificate to admin
2015-11-03 21:54:48 -05:00
Bill DeRusha
6123827ab1
Compare all refund dates in UTC
2015-11-02 20:00:06 -05:00
Bill DeRusha
572ea25678
Convert segment country to unicode.
2015-11-02 11:59:47 -05:00
Eric Fischer
923917c033
Merge pull request #10452 from edx/bderusha/rc-2015-11-03-bug
...
Fix dashboard page load error when cert_status is None
2015-11-01 18:17:21 -05:00
Bill DeRusha
62f3cf9c46
Fix cert_status None bug
2015-11-01 18:16:16 -05:00
jsa
c68af9d21e
Show xseries upsell even if the course is not yet in session
...
ECOM-2780
2015-11-01 15:54:33 -05:00
Ahsan Ulhaq
c47311b11f
Add the html and css and backend changes required for the xseries.
2015-10-30 20:59:26 +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
Bill DeRusha
60fc3f5705
Conditionally show unenroll action based on certificat status
2015-10-23 14:59:17 -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
Clinton Blackburn
f967cfce8b
Merged release to master
...
Resolved conflicts from hotfix-2015-10-05
2015-10-05 14:46:32 -04:00
