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

45263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
8bcdcc522e EDUCATOR-1290 | Make sure we have a key with a course id in it before library content logging call. 2018-02-28 09:49:25 -05:00
David Ormsbee
f5a4ad20aa Merge pull request #17451 from mitodl/fix_outline_aq_course_structure_api 
Fixed edX block structure api to load override data
 2018-02-28 09:39:09 -05:00
Calen Pennington
7f6c101284 Merge pull request #17565 from edx/re-add-asset-index-changes 
Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…
 2018-02-27 21:28:02 -05:00
Calen Pennington
b1c9ad175d Revert "Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack"" 
This reverts commit 67177ac72d.

The original PR cause a breakage on production due to webpack building two different
copies of the asset_index.js bundle. However, it is unclear whether that was a
transitory issue or not. This commit restores the original PR to validate whether
the problem is reproducible.
 2018-02-27 16:18:27 -05:00
Dennis Jen
6da648899f Merge pull request #17530 from edx/dsjen/assets-search-waffle 
Added waffle switch for files & uploads search UI
 2018-02-27 14:56:10 -05:00
Sofiya Semenova
8acd6d5eec Merge pull request #17554 from edx/sofiya/2095-3 
Check that a user enrollment exists in the course outline
 2018-02-27 13:10:20 -05:00
Eric Fischer
e0557931a7 Merge pull request #17471 from edx/efischer/sfe_use_i18n 
provide data to SFE in DOM
 2018-02-27 12:17:30 -05:00
Christopher Lee
3dd01a1ad9 Merge pull request #17542 from mahyard/fix_wiki_translation 
Find html files of django-wiki under templates directory
 2018-02-27 11:40:39 -05:00
Tyler Hallada
cc1a1b6c36 Merge pull request #17558 from edx/dahlia/fix_release 
remove fsevents from package-lock.json
 2018-02-27 11:27:52 -05:00
Eric Fischer
1d3c794315 remove fsevents from package-lock.json 2018-02-27 11:16:36 -05:00
Alex Dusenbery
05319ab516 Fixup logging statement for randomized blocks. 2018-02-27 10:28:07 -05:00
Sofiya Semenova
ee08019f6e Check that a user enrollment exists in the course outline 2018-02-27 10:26:53 -05:00
Eric Fischer
2717ef5b80 Provide i18n data to SFE in DOM 
EDUCATOR-1613, edx-platform changes
 2018-02-27 10:17:35 -05:00
Awais Jibran
9800ea2b5b Merge pull request #17547 from edx/aj/fix-course-home-page 
Fix course home page bug
 2018-02-27 17:37:30 +05:00
Awais Jibran
3ff2488025 Fix course home page bug 2018-02-27 16:47:23 +05:00
Bill DeRusha
071594392b Merge pull request #17384 from edx/bderusha/zendesk-plugin 
zendesk proxy plugin
 2018-02-26 17:06:56 -05:00
Bill DeRusha
44469a9ba4 Merge pull request #17386 from edx/bderusha/generic-zendesk 
Create generic support ticket interface (remove zendesk specific code)
 2018-02-26 15:21:37 -05:00
Farhanah Sheets
755b96d581 Merge pull request #17552 from edx/fsheets/sfe-version-bump 
Bump studio-frontend version
 2018-02-26 14:47:04 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Matt Tuchfarber
2562ae2e9a Add self to AUTHORS 2018-02-26 14:29:08 -05:00
Bill DeRusha
9611284df0 zendesk proxy plugin 2018-02-26 14:20:32 -05:00
Brian Mesick
5b8091c64c Merge pull request #17539 from edx/bmedx/update_create_sites_and_configs_for_devstack 
Update create_sites_and_configurations for devstack wl tests
 2018-02-26 14:08:02 -05:00
Farhanah Sheets
43ca713fa6 Bump studio-frontend version 2018-02-26 13:46:02 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Bill DeRusha
1aca252e19 Merge pull request #17383 from edx/bderusha/disc-plugin 
Convert discussion to plugin
 2018-02-26 13:18:10 -05:00
bmedx
f17cf3ad9a Update create_sites_and_configurations for devstack wl tests 2018-02-26 12:52:21 -05:00
Matt Tuchfarber
e3b29af3db Merge pull request #17543 from open-craft/clemente/upstream-add-block-to-course-about 
Add template block to allow redefining the course details section in themes
 2018-02-26 11:21:59 -05:00
Daniel Clemente Laboreo
628892667b Add template block to allow redefining the details section in themes 2018-02-26 11:20:28 +02:00
Mahyar Damavand
42f91a1be7 Find html files of django-wiki under templates directory 2018-02-24 12:47:01 +03:30
Feanil Patel
f7ade3406c Merge pull request #17541 from edx/revert-17536-feanil/reduce_requirements_complexity 
Revert "Reduce requirements complexity."
 2018-02-23 16:54:20 -05:00
Feanil Patel
0ca5cb9b74 Revert "Reduce requirements complexity." 2018-02-23 16:54:09 -05:00
Feanil Patel
481c0d053a Merge pull request #17540 from edx/revert-17538-feanil/fix-version-conflict 
Revert "Update setup.py for calc module."
 2018-02-23 16:53:58 -05:00
Feanil Patel
f6d3421751 Revert "Update setup.py for calc module." 2018-02-23 16:53:41 -05:00
Feanil Patel
d51718c47b Merge pull request #17538 from edx/feanil/fix-version-conflict 
Update setup.py for calc module.
 2018-02-23 15:32:46 -05:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -05:00
George Babey
1c7720a561 Bump drf-extensions for pagination move 2018-02-23 14:20:00 -05:00
Feanil Patel
c0b5916804 Update setup.py for calc module. 
We've been running with pyparsing 2.2.0 in production this whole time
so I'm pretty sure we can depend on this.
 2018-02-23 14:02:54 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Feanil Patel
a182e50c4b Merge pull request #17536 from edx/feanil/reduce_requirements_complexity 
Reduce requirements complexity.
 2018-02-23 13:12:25 -05:00
Bill DeRusha
4fba472139 Discssions as a plugin 2018-02-23 09:23:53 -05:00
Albert (AJ) St. Aubin
312a9ec160 Merge pull request #17533 from edx/aj/LEARNER-3898 
Added entitlement redeemability method to the check for fulfillable
 2018-02-23 07:44:46 -05:00
hamzamunir7300
9d8c1a266f Merge pull request #17528 from edx/LEARNER-4230 
Incorrect position of the label "Receive course emails"
 2018-02-23 15:34:16 +05:00
Ahsan Ul Haq
3b8d41861f Merge pull request #17508 from edx/ahsan/LEARNER-3729-program-certificate-shareable 
Make sure user is login in credential when redirected from lms
 2018-02-23 15:31:56 +05:00
Ahsan Ulhaq
5a67f50174 Make sure user is login in credential when redirected from lms 
LEARNER-3729
 2018-02-23 13:15:02 +05:00
Feanil Patel
3a4c36b4ef Remove requirements that should be a part of the venv definition. 2018-02-23 00:16:01 -05:00
Feanil Patel
d800ce5673 Move pyparsing to base.txt 
It's unclear why this is in pre.txt
 2018-02-22 23:34:21 -05:00
Feanil Patel
9514f9d3be With wheels this statement is no longer true. 2018-02-22 23:14:10 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master 
Merge release back to master
 2018-02-22 18:32:36 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Albert St. Aubin
8c5e37ba20 Added entitlement redeemability method to the check for fulfillable 
entitlements

[LEARNER-3898]
 2018-02-22 15:00:19 -05:00