Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
41,915 Commits 1 Branch 0 Tags
dfca1fa2fac7433d99e506dd00a778b9e5f0fb77
Commit Graph

3685 Commits

Author SHA1 Message Date
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" 
This reverts commit d940bbfd09.
 2017-07-17 14:11:24 -04:00
Brittney Exline
6c761ce8aa Revert "Specify catalog URL to configure" 
This reverts commit add01fdfab.
 2017-07-17 14:11:24 -04:00
Matt Tuchfarber
4813df02a3 Fix WL sites from causing multiple zendesk emails 
WL-1109. Currently the system is using org filters to tag zendesk
tickets. MITxPro uses both MITxPro and MITProfessionalX org filters
to pull courses from both orgs. This is causing multiple emails to
be sent from Zendesk as they are getting tagged with both
whitelabel_MITProfessionalX and whitelabel_MITxPRO. This fix changes
to using SITE_NAME instead.
 2017-07-17 12:47:23 -04:00
Simon Chen
be3c29b006 Merge pull request #15550 from edx/LEARNER-683 
Allow enrollment into expired seats if the api is called by ECOM service
 2017-07-13 09:04:08 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject 
Use platform_name instead of site_name in password reset email
 2017-07-13 05:52:21 -07:00
Simon Chen
a3d511926f Allow enrollment into expired seats if the api is called by ecom service 2017-07-12 16:04:52 -04:00
Kyle McCormick
fade4a10af Implement event for forum thread views 
EDUCATOR-341
 2017-07-11 12:42:49 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -04:00
Sofiya Semenova
d01d165e4c Merge pull request #15386 from edx/sofiya/ed-378 
Add group_moderator role
 2017-07-10 14:13:09 -04:00
Omar Al-Ithawi
8816b85464 Use the marketing contact us page in email confirm change message 2017-07-10 10:24:49 -04:00
bmedx
cfb53a3526 Ensure User model is unregistered before registering with Django admin 
- PLAT-1631
 2017-07-07 11:02:53 -04:00
Brian Mesick
af43d08b22 Revert "Upgrade django-ratelimit-backend to 1.1.1" 2017-07-06 16:18:02 -04:00
Albert St. Aubin
6cdcf8e9b8 Discussion group moderation 2017-07-06 13:39:03 -04:00
Afzal Wali
b8a310d54b Put the program_types filter under the waffle switch 2017-07-06 13:12:43 -04:00
Tasawer Nawaz
bba596728a Merge pull request #15450 from edx/tasawer/learner-1710-fix-dashboard-HttPClientError 
Fix 500 error on learner dashboard
 2017-07-06 08:29:10 +05:00
Brian Mesick
bc485ea580 Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482 
Upgrade django-ratelimit-backend to 1.1.1
 2017-07-05 16:54:49 -04:00
tasawernawaz
a7b2009566 Fix 500 error on learner dashboard 
LEARNER-1710
 2017-07-05 21:44:43 +05:00
bmedx
d6d7fcaf4f Fix NotRegistered error when running makemigrations 2017-07-05 12:28:22 -04:00
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -04:00
Afzal Wali
383208c4c8 multitenant Program cache. 
Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys.
Learner-1146
 2017-07-04 14:20:55 +05:00
Jesse Shapiro
add01fdfab Specify catalog URL to configure 2017-07-03 10:48:11 -04:00
Jesse Shapiro
e408feffb8 Merge pull request #15400 from open-craft/haikuginger/enterprise_audit_enrollment 
[ENT-457] Create EnterpriseCourseEnrollment when enrolling via Track Selection page
 2017-06-30 13:22:17 -04:00
Jesse Shapiro
d940bbfd09 Create EnterpriseCourseEnrollment when enrolling via Track Selection page 2017-06-30 12:39:14 -04:00
John Eskew
947e814216 Remove deprecated django.utils.importlib. 2017-06-29 12:08:21 -04:00
Salah Alomari
8dba6c49a6 Use platform_name instead of site_name in password reset email subject 2017-06-28 02:30:58 +03:00
Salah Alomari
4f6eaa59d1 Use platform_name instead of site_name in password reset email 2017-06-28 02:30:17 +03:00
Brittney Exline
e71f1afdf3 Merge pull request #15408 from edx/bexline/send_to_registration_first 
ENT-447 Add flag to third party auth SAML provider to send to the registration page first
 2017-06-27 16:55:29 -04:00
Brittney Exline
ae8a5f2bf7 ENT-447 Add flag to third party auth SAML provider to send to the registration page first 2017-06-27 13:12:00 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Ivan Ivic
6e45f00041 Created new embargo check api 
LEARNER-1523
LEARNER-1524
 2017-06-26 15:02:04 -04:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02:00
David Ormsbee
30385697a1 Merge pull request #15382 from edx/ormsbee/webpack_common_chunk_vagrant 
Add support for CommonsChunkPlugin for Webpack.
 2017-06-26 09:37:43 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
David Ormsbee
962b09f73c Add support for CommonsChunkPlugin for Webpack. 
This lets us consolidate chunks of JavaScript that are common to
multiple bundles, so that they can live in their own shared file. This
will be more relevant when we have UI components -- there's actually
very little shared code right now.
 2017-06-22 21:14:13 -04:00
Sven Marnach
f127a29d62 Add feature flag to disable email address changes. 2017-06-21 15:15:52 +02:00
Afzal Wali Naushahi
2b4fb4fd95 Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration 
Updated CatalogIntegration to use a site-specific URL
 2017-06-21 15:31:53 +05:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05:00
Clinton Blackburn
dd1f834697 Displaying verification denial reasons on dashboard 
Learners now see (on the dashboard) a list of reasons why their verifications were denied.

LEARNER-1486
 2017-06-20 17:44:13 -04:00
Uman Shahzad
8b65ca17c5 Migrate to latest, split python-social-auth. 
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
 2017-06-20 22:05:36 +05:00
Uman Shahzad
d5c85331c5 Automatically populate additional fields for SSO scenarios. 
When authenticating using an SAML IdP, gather additional user
data besides what is standard. Requires admin to input JSON
in settings to recognize the additional user data.
 2017-06-18 22:18:43 +00:00
Giulio Gratta
2b25c9fc78 Enable DEFAULT_MODE to be customized in config 
- Keeps platform set default of "Audit" to be backwards compatible and not break stuff
- get COURSE_MODE_DEFAULTS from config if set
 2017-06-12 14:09:00 -04:00
Ibrahim Ahmed
07dc1e6b20 Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 
Exclude hidden programs from white label course page and home page
 2017-06-10 03:41:09 +05:00
Ibrahim
9995716899 Exclude hidden programs from white label course and homepage 
LEARNER-1126, LEARNER-1127
 2017-06-09 21:42:21 +05:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
Sofiya Semenova
6acc6fde95 ED-367 log in production 2017-06-08 18:48:26 +00:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -04:00
cahrens
8951ac8c61 Refactor server-size code to enable enrollment tracks. 
EDUCATOR-11
 2017-06-05 12:59:50 -04:00
Clinton Blackburn
ab52966fdb Updated Enrollment API to always store enrollment attributes 
Enrollment attributes are now always stored, regardless of whether an enrollment is being created or updated. This will ensure that learners who purchase paid modes, without first enrolling in a non-paid mode, can request refunds if they choose to un-enroll from a course run within the refund window.

LEARNER-1282
 2017-06-05 11:04:57 -04:00
Uman Shahzad
e7e79c9b24 Correct activation email support link defaults in views.py 2017-06-05 00:34:39 +05:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00