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

40399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahsan Ulhaq
e51c692ef8 Merge pull request #14570 from edx/ahsan/ECOM-6463-login-should-not-point-asset-new 
login should not point asset new
 2017-03-08 18:26:07 +05:00
Clinton Blackburn
078974d24a Disabled search for Docker-based devstack 
This feature is not well-documented, so it is unclear how to setup Elasticsearch properly to make it work. The next person who needs to work on this feature will need to make it work and, ideally, document it.
 2017-03-07 21:21:49 -05:00
Brian Mesick
8caa4c56d6 Merge pull request #14619 from edx/bmedx/user-task-email 
PLAT-1075 - Send email async upon completed django-user-tasks
 2017-03-07 14:32:53 -05:00
Calen Pennington
4bd13a6e34 Merge pull request #14650 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-07 13:02:30 -05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
Awais Jibran
af76401b23 Discussion Selector fixes. TNL-6648 2017-03-07 08:50:39 -05:00
Attiya Ishaque
df73474c5c Merge pull request #14645 from edx/aj/discussion-fixes 
Discussion Selector fixes.
 2017-03-07 18:29:27 +05:00
M. Rehan
9351600c73 Merge pull request #14594 from edx/mrehan/duplicate-video-id-in-basic-tab 
TNL-6489 – duplicate video id in basic tab
 2017-03-07 18:03:21 +05:00
Awais Jibran
9c0f72d516 Discussion Selector fixes. TNL-6648 2017-03-07 17:08:51 +05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Ahsan Ulhaq
8688edaf4f Merge pull request #14595 from edx/ahsan/ECOM-7312-lms-user-menu-dropdown-a11y-issues 
LMS user menu dropdown a11y issues
 2017-03-07 15:12:05 +05:00
Eric Fischer
7ad0e27d23 Merge pull request #14641 from edx/efischer/masquerade_progress 
Allow masquerade on progress page
 2017-03-06 21:03:22 -05:00
mikedikan
369c13cd53 Merge pull request #14614 from edx/mdikan/remove-deprecated-fields-on-apiconfig 
Removing unused fields on ProgramApiConfig model
 2017-03-06 18:14:27 -05:00
Eric Fischer
50371ee59a Allow masquerade on progress page 2017-03-06 16:53:26 -05:00
Mike Dikan
06a6d8525a Removing unused fields on ProgramApiConfig model 
ECOM-7196

Updating model to only include the non-deprecated fields.  This work is a follow on to ECOM-7195 and SHOULD NOT be merged until that PR is merged.
 2017-03-06 16:46:04 -05:00
Michael Youngstrom
dabda5cac2 Merge pull request #14612 from edx/michaelyoungstrom/pa11ycrawler_version_bump 
Bump Pa11ycrawler version to 1.6.1
 2017-03-06 13:54:27 -05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Michael Youngstrom
398c97e917 Bump Pa11ycrawler version to 1.6.1 2017-03-06 17:19:59 +00:00
Ayub khan
543e2a7d00 Merge pull request #14634 from edx/revert-14603-asadazam/ecom-7252-refund-cutoff-log 
Revert "added log for refund cutoff date"
 2017-03-06 21:49:53 +05:00
Ayub khan
b42089b0dd Revert "added log for refund cutoff date" 2017-03-06 20:50:05 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Brittney Exline
57fd280b00 Merge pull request #14563 from edx/bexline/sf_oauth 
ENT-191 Adding new edx-enterprise packages to be optionally installed
 2017-03-06 10:07:44 -05:00
Eric Fischer
83f2be4929 Merge pull request #14588 from edx/efischer/kill_stuff 
Kill edx-reverification-block
 2017-03-06 09:29:36 -05:00
Michael Youngstrom
01ed17426f Merge pull request #14628 from edx/michaelyoungstrom/revert_django_setting 
[WIP] Revert Django renderer change
 2017-03-03 17:37:41 -05:00
Michael Youngstrom
fa74e0bf19 Revert Django renderer change 
Force run on PR

Remove force run on PR
 2017-03-03 17:34:02 -05:00
bmedx
6e88c2d26e Linting fixes 2017-03-03 17:03:35 -05:00
bmedx
322de9604d Address PR feedback 2017-03-03 15:42:11 -05:00
Brandon DeRosier
20ae9948d1 Merge pull request #14610 from open-craft/bdero/fix-enterprise-api-url 
Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set
 2017-03-03 14:30:10 -05:00
Nimisha Asthagiri
0465f6bf4a Merge pull request #14627 from edx/neem/bs_fix_logs 
Fix BlockStructure log statements
 2017-03-03 13:26:11 -05:00
Nimisha Asthagiri
6e61f063fa Merge pull request #14626 from edx/neem/update_bs_version 
Increment BlockStructureBlockData.VERSION
 2017-03-03 12:39:23 -05:00
Nimisha Asthagiri
9c2e5f257c Fix BlockStructure log statements. 2017-03-03 12:20:58 -05:00
alisan617
190501b873 Merge pull request #14609 from edx/alisan/site-status-PL 
platform site status message bar styling clean up
 2017-03-03 12:02:27 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Nimisha Asthagiri
bda2a793ac Increment BlockStructureBlockData.VERSION 2017-03-03 11:42:52 -05:00
Brian Jacobel
f3bce3ee20 Merge pull request #13903 from proversity-org/proversity/feature-cookie-consent 
add cookie consent feature flag and popup banner
 2017-03-03 11:16:16 -05:00
bmedx
d5eb9c0b21 Fix more lint violations, remove prints 2017-03-03 10:32:22 -05:00
Eric Fischer
a82b8549dc Merge pull request #14607 from edx/efischer/deprecated_message 
More specific messaging for unsupported block types
 2017-03-03 10:27:50 -05:00
Cliff Dyer
d6e2673917 Merge pull request #14620 from edx/cdyer/celeryutils-0.1.3 
Version bump and use new pypi version.
 2017-03-03 10:14:09 -05:00
alisan617
7802e518d3 remove white error img replace with FA icon 2017-03-03 09:50:54 -05:00
bmedx
327aeb18aa Fix pep8 violation 2017-03-03 09:49:23 -05:00
Awais Jibran
2881bac3bc Merge pull request #14623 from edx/aj/fix-edit-discussions 
Fix discussion Edit post.
 2017-03-03 18:29:51 +05:00
mikedikan
dca22ff229 Merge pull request #14613 from edx/mdikan/remove-deprecated-references-to-apiconfig 
Remove deprecated references to ProgramsApiConfig model
 2017-03-03 07:42:21 -05:00
Ned Batchelder
65febd6122 Merge pull request #14618 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-03 06:28:24 -05:00
AsadAzam
4af5d45dcd Merge pull request #14603 from edx/asadazam/ecom-7252-refund-cutoff-log 
added log for refund cutoff date
 2017-03-03 15:57:43 +05:00
Awais Jibran
0f1ec82e0a Fix discussion Edit post. 
TNL-6631
 2017-03-03 15:29:13 +05:00
Asad Azam
3102b2dd80 added log for refund cutoff date 2017-03-03 15:05:51 +05:00
Ahsan Ulhaq
090f4e419f Merge pull request #14600 from edx/ahsan/ECOM-6977-ensure-hidden-html-content-not-render 
Hidden html content on the dashboard are rendered
 2017-03-03 14:51:34 +05:00
Ahsan Ulhaq
2d1bb9bf7f Hidden html sontent on the dashboard are rendered 
ECOM-6977
 2017-03-03 13:17:31 +05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
J. Cliff Dyer
d216488352 Version bump and use new pypi version. 2017-03-02 16:20:10 -05:00