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

18841 Commits

Author SHA1 Message Date
McKenzie Welter
361af7ef5a add test coverage for entitlement course run retrieval 2018-04-05 14:49:33 -04:00
Michael Terry
c19d01a994 Add live validation to password reset 
Adds a new React factory for that page to handle the logic. Also
cleans up the UI a little (centers it, stops using serif font, etc).
 2018-04-05 11:59:26 -04:00
Eric Fischer
32f9902f2e Merge pull request #17834 from edx/thallada/incontext-waffle 
Studio-frontend in-context image selection modal
 2018-04-05 10:34:40 -04:00
Dmitry Gamanenko
df9dec9b88 Fix "admin/auth/user/add "username" missing field. 
Add test for PR `fix_username_missing_field`

Update test case. Remove blank line whitespace.
 2018-04-05 16:22:18 +03:00
Stu Young
50744e0aac Merge pull request #17876 from edx/testeng/bokchoy_auto_cache_update_cffbf0280304e9c331e8ea1fe87f020ea6a3a329 
Bokchoy db cache update
 2018-04-04 14:53:34 -05:00
Tyler Hallada
d31249ba20 Studio-frontend in-context image selection modal 
Open edit image modal via a custom signal

Send img tag attributes in open signal

Send natural image dimensions if no attr specified

Add new modal button in addition to old button

Also load built CSS when waffle switch on

Swap out TinyMCE toolbar button on waffle switch

Pass LANGUAGE_CODE from Django to template to studio-frontend

Define request.LANGUAGE_CODE in test_container_page.py
 2018-04-04 15:48:36 -04:00
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
edx-cache-uploader-bot
62d8ae5cc2 Updating migrations 2018-04-04 13:42:03 -05:00
Douglas Hall
eb00772071 Merge pull request #17875 from edx/douglashall/ENT-952 
Upgrade edx-enterprise package to 0.67.1.
 2018-04-04 13:32:38 -04:00
Michael Youngstrom
382f8200be Merge pull request #17862 from edx/testeng/bokchoy_auto_cache_update_6e2e48398da9f11a3fe7ac599d6110034865b901 
Bokchoy db cache update
 2018-04-04 11:39:42 -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
edx-cache-uploader-bot
c420603913 Updating migrations 2018-04-03 13:24:54 -04:00
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
Alex Dusenbery
1cbf7ab0fb EDUCATOR-1290 | Remove over-limit block keys randomly for library content blocks. 2018-03-31 13:43:11 -04: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
sanfordstudent
028ad2ebd4 Merge pull request #17743 from edx/sstudent/EDUCATOR-2444 
Show inline discussions by default
 2018-03-29 09:26:12 -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
Sanford Student
0bfe9c8d94 remove showbydefault 2018-03-28 15:33:52 -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
Michael Youngstrom
9c74f4b145 Update lettuce db cache 2018-03-28 12:21:30 -04:00
Michael Youngstrom
6715f086d6 Update lettuce db cache 2018-03-27 21:42: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
Douglas Hall
ea18712fa9 Merge pull request #17802 from edx/douglashall/ENT-823 
Upgrade edx-enterprise to 0.67.0.
 2018-03-27 13:41:35 -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
edx-cache-uploader-bot
7f92409804 Updating migrations 2018-03-27 11:49:05 -04:00
noraiz-anwar
f18e0b881c use library summary to fetch metadata 2018-03-27 15:57:14 +05:00
edx-cache-uploader-bot
0dbaffa405 Updating migrations 2018-03-26 15:08:41 -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
Michael Youngstrom
1ca1838ce8 Merge pull request #17455 from edx/estute/jenkins-ff-57-b 
Support firefox 59 upgrade for CI and local testing
 2018-03-26 11:50:56 -04:00