Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Brian Mesick
e71cfb2813 Merge pull request #17879 from edx/bmedx/remove_default_site_from_attributes 
Exclude the default site from UserAttribute 'created_on_site'
 2018-04-04 15:46:58 -04:00
bmedx
88153b7ac2 Exclude the default site from UserAttribute 'created_on_site' 
This table is getting slammed and causing deadlocks, since 90% of it
is just this one setting on the default site we're going to stop saving
those and make it a default assumption going forward.
 2018-04-04 15:00:59 -04:00
Douglas Hall
d238a2de96 Upgrade edx-enterprise package to 0.67.1. 
https://github.com/edx/edx-enterprise/compare/0.67.0...0.67.1
 2018-04-04 09:17:20 -04:00
Jillian Vogel
4af929fb8b Fixes test failures 2018-04-04 10:22:39 +09:30
Jillian Vogel
761acdfc6d Shows the account activation message in the main content area 
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
e417c5f8c2 Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
22ee400b15 Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED 
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
b44114d171 Shows the account activation message in the sidebar 
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.
 2018-04-04 09:33:32 +09:30
Brian Mesick
4841ff7943 Merge pull request #17790 from edx/bmedx/user_retirement_utils 
Add some common functionality for retiring users
 2018-04-02 14:41:52 -04:00
Brian Beggs
161bf6943d Merge pull request #17850 from mitodl/fix_aq_no_name_notmigrations 
Fixed error: ImportError: No module named notmigrations
 2018-04-02 14:07:26 -04:00
bmedx
b26d7913f5 Add some common functionality for retiring users 
- Methods for getting hashed retired users and usernames
- A DRF permission for retiring users
 2018-04-02 13:48:52 -04:00
Jeremy Bowman
d622380cc5 Account for Django block on DDL in transactions 2018-04-02 11:47:54 -04:00
Amir Qayyum Khan
b6c6535f15 Fixed error: ImportError: No module named notmigrations 2018-04-02 17:44:59 +05:00
Albert (AJ) St. Aubin
13e7ec6aa5 Merge pull request #17804 from edx/aj/LEARNER-4493 
Aj/learner 4493
 2018-03-30 12:24:31 -04:00
McKenzie Welter
2762a6114b allow site and mode to be nullable in admin form 2018-03-30 10:24:31 -04:00
Albert (AJ) St. Aubin
545c86a0a7 Merge pull request #17829 from edx/aj/LEARNER-4567 
Protection for when there is no CourseOverview data available.
 2018-03-30 07:30:22 -04:00
Troy Sankey
2e05eeca54 reorder 0017_auto_20180327_1631 to be after the other 0017 
The migration 0017_remove_icon_class_image_secondary_fields was in
conflict with 0017_auto_20180327_1631, so we bump the latter to 0018.
 2018-03-29 14:35:55 -04:00
edx-pipeline-bot
70ae23d4c2 Merge pull request #17831 from edx/release-mergeback-to-master 
Merge release back to master
 2018-03-29 13:58:22 -04:00
Albert St. Aubin
1d9b3842ef Corrects issue with Entitlement Auto upgrade and Soft Upgrade deadline 
issues

[LEARNER-4493]
 2018-03-29 12:27:28 -04:00
Albert St. Aubin
35324a7314 Moved to a try catch block 2018-03-29 10:35:43 -04:00
Albert St. Aubin
e8a3077bfa Protection for when there is no CourseOverview data available. 2018-03-29 07:10:58 -04:00
Douglas Hall
82038870aa Merge pull request #17808 from edx/douglashall/ENT-936 
ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration.
 2018-03-28 15:39:15 -04:00
Douglas Hall
2ecbe19b29 ENT-936 Allow TPA providers to be configured to not send a welcome email upon registration. 2018-03-28 14:00:35 -04:00
McKenzie Welter
cc19e50590 add mode field to entitlement policy model and set custom policy on entitlement create 2018-03-28 12:53:20 -04:00
Eric Fischer
5540954dee Merge pull request #17801 from edx/efischer/sfe_1.6.2 
Load studio-frontend language files
 2018-03-27 16:15:23 -04:00
Troy Sankey
81ed96bc88 bump django to 1.11.11 2018-03-27 15:55:07 -04:00
Tyler Hallada
04279bf5af Refer to new sfe file names in templates 2018-03-27 15:17:58 -04:00
Eric Fischer
022001e53d EDUCATOR-2584 2018-03-27 12:42:00 -04:00
Douglas Hall
5c1ab83c29 Upgrade edx-enterprise to 0.67.0. 
https://github.com/edx/edx-enterprise/compare/0.66.1...0.67.0
 2018-03-27 12:21:55 -04:00
Troy Sankey
b1ce012a94 move global status messages from the header to the user notification area 2018-03-26 12:06:29 -04:00
Joseph Mulloy
e8d95c1c73 Disable course enrollments admin page OPS-2943 2018-03-26 11:40:16 -04:00
McKenzie Welter
a6ac6781c3 include created datetime in entitlement support detail serializer 2018-03-23 11:19:38 -04:00
McKenzie Welter
e5d1f04a89 move support actions to existing entitlement api 2018-03-22 16:11:46 -04:00
Albert (AJ) St. Aubin
273ec926d3 Merge pull request #17744 from edx/aj/LEARNER-4494 
Updating the default long term expiration to be 730 days for entitlem…
 2018-03-22 11:57:02 -04:00
Bill Filler
305bd7dd4b Merge pull request #17650 from edx/ibrahimahmed443/WL-1473-add-fields-instructor-dashboard 
Ibrahimahmed443/wl 1473 add fields instructor dashboard
 2018-03-22 09:56:43 -04:00
Albert St. Aubin
7010eff423 Adding migration to update the expiration_period default 2018-03-21 17:09:03 -04:00
Albert (AJ) St. Aubin
9ac87b5ea3 Merge pull request #17741 from edx/aj/increase_enrollments_throttle 
LEARNER-4676: Increase the Throttle on the enrollments API to allow ecommerce to re…
 2018-03-21 16:22:47 -04:00
Albert St. Aubin
eeb97318b6 Updated tests to use new 24 months 2018-03-21 15:57:15 -04:00
Albert St. Aubin
7a02324bf1 Updating the default long term expiration to be 730 days for entitlements 
[LEARNER-4494]
 2018-03-21 15:45:38 -04:00
Albert St. Aubin
f2ee173aae Increase the Throttle on the enrollments API to allow ecommerce to request more frequently 
[LEARNER-4676]
 2018-03-21 14:14:52 -04:00
Michael Terry
a576d682ff Improve password complexity messaging 
Send password form instructions that include password complexity and
also send error messages back that include all parts of the
complexity instead of single parts at a time.

And clean up phrasing to be more consistent.
 2018-03-21 10:29:53 -04:00
Troy Sankey
9afe485f44 add the maintenance banner to the student dashboard and course homepage 2018-03-20 17:55:31 -04:00
Waheed Ahmed
d82aaa9892 Merge pull request #17706 from edx/waheed/LEARNER-4513-fix-none-type-entitlement-passing 
Fix None type entitlement passing.
 2018-03-16 18:50:44 +05:00
Michael Terry
a0c6f66252 Check policy during pw live validation 
The password live validation was not considering the full password
complexity settings. This branch hooks that up and refactors the
various ways to validate a password to all go through the same code
path.

LEARNER-4502
LEARNER-4504
 2018-03-16 09:23:43 -04:00
Waheed Ahmed
7128370666 Fix None type entitlement passing. 
LEARNER-4513
 2018-03-16 16:41:49 +05:00
Ibrahim
2bb790680a add role and expose reason field to Instructor Dashboard Manual Enrollment 
WL-1473
 2018-03-16 15:47:53 +05:00
Tasawer Nawaz
8a0b2d2d45 Merge pull request #17680 from edx/tasawer/learner-4428/stop-using-single-basket-derecated-view 
stop using deprecated single item basket view
 2018-03-14 21:40:07 +05:00
Michael Terry
d40ce8c8d0 Use Levenshtein not nltk 2018-03-14 11:49:09 -04:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view 
LEARNER-4428
 2018-03-14 20:29:51 +05:00
Albert St. Aubin
85eb168a34 Uses the entitlements course run enrollment to get the course key when 
available

[LEARNER-4228]
 2018-03-14 09:09:12 -04:00