Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,018 Commits 1 Branch 0 Tags
2ab2ed7760270e2398aaa038d2e5421c9a73fb8d
Commit Graph

3698 Commits

Author SHA1 Message Date
Simon Chen
9b15f58037 Merge pull request #15661 from edx/schen/learner-1521 
Move the user_attribute creation for site
 2017-07-26 10:47:38 -04:00
Afzal Wali
ec1473f84f Added a missing parameter. 2017-07-26 15:46:49 +05:00
Simon Chen
20a16f24b5 Move the user_attribute creation for site from within the user creation transaction to outside 
learner-1521
 2017-07-25 13:27:57 -04:00
Clinton Blackburn
9efa7770f8 Resolved multi-tenant program issues 
A site must be passed so the system knows which URL to use to contact
the Discovery Service.
 2017-07-25 19:37:14 +05:00
Harry Rein
b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy 
Adding in-course messages on the home page.
 2017-07-24 16:06:52 -04:00
Harry Rein
08df53e110 Adding in course messaging to the home page. 
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
 2017-07-24 15:17:12 -04:00
Diana Huang
c338b751f2 Consolidate access checks for prereqs and surveys. 2017-07-24 11:42:39 -04:00
Jesse Shapiro
91752ad98a Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent 
[ENT-491] Remove SSO consent features; verify fully-populated consent URL generation
 2017-07-24 07:43:16 -04:00
Jesse Shapiro
fa9c09f9fe Remove Enterprise SSO hooks 2017-07-21 18:24:09 -04:00
Ari Rizzitano
b524f0e15b Merge pull request #15610 from edx/ari/fix-webpack-failures 
catch WebpackLoaderBadStatsError in test runs
 2017-07-21 11:32:39 -04:00
Ari Rizzitano
038d5a1351 catch WebpackLoaderBadStatsError to prevent unittest concurrency errors 
[LEARNER-1938]

try also catching WebpackLoaderBadStatsError
[LEARNER-1938]

catch BaseWebpackLoaderException also

do i need to import the exception?

add better logging
 2017-07-21 10:17:55 -04:00
Ahmed Jazzar
fc5716d9b1 Fixed milestone issues 
In settings_handler and any_unfulfilled_milestones (for mobile APIs)
 2017-07-20 10:55:44 -07:00
Marko Jevtic
2a7b41673b [LEARNER-1104] Allow staff members to view enrollment for any user 2017-07-19 12:45:24 +00:00
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