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

45608 Commits

This Branch
This Branch
All Branches
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
Matthew Piatetsky
b2ebacf4c6 Merge pull request #17787 from edx/REV-19 
fix REV-19 experiment check for refunds
 2018-03-30 14:28:01 -04:00
Matthew Piatetsky
063118cf0e fix REV-19 experiment check for refunds 2018-03-30 13:28:43 -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
06c71694a6 Merge pull request #17836 from edx/McKenzieW/learner-4095 
allow site and mode to be nullable in admin form
 2018-03-30 11:13:27 -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
965cf0c8e6 Merge pull request #17832 from edx/pwnage101/reorder-third_party_auth-0017 
reorder 0017_auto_20180327_1631 to be after the other 0017
 2018-03-29 14:44:28 -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
Matthew Piatetsky
81ba82b5f1 Merge pull request #17823 from edx/REV-56 
Add chapter index to dom
 2018-03-29 12:16:02 -04:00
Alex Dusenbery
60d71ce581 EDUCATOR-2553 | Bump edx-completion to 0.1.4; Add feature-gating tests for completion. 2018-03-29 12:08:33 -04:00
Waheed Ahmed
5a47cecb9b Merge pull request #17828 from edx/waheed/LEARNER-4801-route-sailthru-tasks-to-lms-ace-queue 
Route sailthru tasks to lms ace queue instead of default.
 2018-03-29 20:47:47 +05:00
Matthew Piatetsky
734e385030 Add chapter index to dom 2018-03-29 11:07:15 -04:00
Albert St. Aubin
35324a7314 Moved to a try catch block 2018-03-29 10:35:43 -04:00
Bill Filler
206f73d095 Merge pull request #17812 from edx/ibrahimahmed443/WL-1491 
Ibrahimahmed443/wl 1491
 2018-03-29 09:34:16 -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
Waheed Ahmed
8eb73a6e17 Route sailthru tasks to lms ace queue instead of default. 
LEARNER-4801
 2018-03-29 14:39:03 +05:00
Awais Jibran
5ac5d9d532 Merge pull request #17796 from edx/aj/COURSE_LOADING_ERROR 
Logging: Error getting the course from modulestore
 2018-03-29 13:09:39 +05:00
Awais Jibran
52f66a8d9d Merge pull request #17795 from edx/aj/use-get-or-create-EDUCATOR-2549 
Use get or create rather than create
 2018-03-29 13:08:53 +05:00
Michael Roytman
c9c97e58c5 Merge pull request #17700 from edx/mroytman/studio-link-to-lms 
Link to LMS from Studio footer
 2018-03-28 16:14:28 -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
Troy Sankey
593710e7cb Merge pull request #17806 from edx/pwnage101/bump-django-to-1.11 
bump django to 1.11
 2018-03-28 14:50:39 -04:00
Ned Batchelder
465427f454 Merge pull request #16297 from open-craft/cornwell/content-of-static-pages 
Ability to set content of static pages via Site Configuration
 2018-03-28 14:28:19 -04:00
Michael Roytman
a0ed8fa38d Add a link to the LMS from Studio footer. 2018-03-28 14:10:30 -04:00
McKenzie Welter
a3521b9ce1 Merge pull request #17758 from edx/McKenzieW/learner-4095 
Enable mode-specific course entitlement policy
 2018-03-28 14:04:40 -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
e7cd7f47cd Revert "Watch assets on specific system." 2018-03-28 12:21:12 -04:00
Michael Youngstrom
187bc401b2 Merge pull request #17809 from edx/youngstrom/update-lettuce-cache 
Update lettuce db cache
 2018-03-28 11:55:19 -04:00
Alex Dusenbery
26ba411eb0 EDUCATOR-2535 | Small style cleanup for course outline. 2018-03-28 10:42:20 -04:00
Awais Jibran
f840b8fdd6 Merge pull request #17811 from edx/aj/video-ie11-issue-fix 
Fix IE11 not loading Video Uploads
 2018-03-28 19:18:36 +05:00
Ibrahim
45831a07f0 Modify Enterprise API to accept list of course_ids for consent_required endpoint 
WL-1491
 2018-03-28 18:03:07 +05:00
Michael LoTurco
498c8915a6 Merge pull request #17814 from edx/MLoTurco/learner-3925-bug-fix 
adjust bug-causing variable name
 2018-03-28 08:55:44 -04:00
Michael LoTurco
45175494ed adjust bug-causing variable name 2018-03-28 08:42:59 -04:00
Awais Jibran
05a1d61f5c quality 2018-03-28 16:41:34 +05:00
Awais Jibran
5ac686bbb9 COURSE_LOADING_ERROR 2018-03-28 14:50:39 +05:00
Awais Jibran
a681d91b46 fix js issue with video uploads 2018-03-28 14:41:27 +05: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
Michael Youngstrom
dc5b75800d Merge pull request #17793 from edx/testeng/bokchoy_auto_cache_update_6c414680e89989ff8a53693971d2066bd3e00c8b 
Bokchoy db cache update
 2018-03-27 12:40:54 -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