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

19868 Commits

Author SHA1 Message Date
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
Joseph Mulloy
e8d95c1c73 Disable course enrollments admin page OPS-2943 2018-03-26 11:40:16 -04:00
Stuart Young
6544b659ce Changes needed to bump to ff59 2018-03-26 09:58:28 -04:00
Michael Youngstrom
afb7673b97 Remove a11y test 2018-03-25 21:53:03 -04:00
Michael Youngstrom
6313a6e82b Merge pull request #17763 from edx/youngstrom/remove-failing-ff-59-tests 
Remove tests that are flaky with firefox 59
 2018-03-23 17:32:11 -04:00
Michael Youngstrom
d4afacb9b2 Remove test_bad_import 2018-03-23 16:40:04 -04:00
Michael Youngstrom
92d019e419 Remove test_about_me_field 2018-03-23 16:11:39 -04:00
Michael Youngstrom
6a04b42166 Remove test_restricted_sections_for_enrollment_track_users_in_lms 2018-03-23 16:10:20 -04:00
Michael Youngstrom
d46233eee1 Remove test_upload 2018-03-23 15:55:20 -04:00
Michael Youngstrom
710d6e5c3d Remove test_course_updated 2018-03-23 15:53:13 -04:00
Michael Youngstrom
f734cb8d15 Remove test_library_updated 2018-03-23 15:52:27 -04:00
Michael Youngstrom
405d40dc19 remove test_landing_page 2018-03-23 13:55:12 -04:00
Michael Youngstrom
b192fe50b6 remove test_as_specific_student 2018-03-23 13:54:26 -04:00
Michael Youngstrom
33236b90e7 Remove test_register_failure 2018-03-23 12:17:23 -04:00
Michael Youngstrom
a60b39e44d Remove test_multiple_course_import_message 2018-03-23 12:17:23 -04:00
Michael Youngstrom
de31fefbaf Remove test_import_timestamp 2018-03-23 12:17:22 -04:00
Michael Youngstrom
9f0a79a5e2 Remove test_bad_filename_error 2018-03-23 12:17:22 -04:00
Michael Youngstrom
d101291417 Remove test_locked_subsections_do_not_appear_in_lms 2018-03-23 12:17:16 -04:00
McKenzie Welter
a6ac6781c3 include created datetime in entitlement support detail serializer 2018-03-23 11:19:38 -04:00
McKenzie Welter
fa90d6e651 Merge pull request #17640 from edx/McKenzieW/learner-4400 
Move support actions to existing entitlement api
 2018-03-23 10:37:52 -04:00
Michael Youngstrom
aad9acfb35 Remove test_task_list 2018-03-22 20:14:44 -04:00
Stuart Young
7fdf16566b remove test_enroll_unregister_student 2018-03-22 15:15:48 -05:00
Stuart Young
9b005ca508 remove test_video_end_time_wo_default_start_time 2018-03-22 15:14:49 -05:00
Michael Youngstrom
94a556200d Remove test_country_field 2018-03-22 16:13:55 -04:00