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

40420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
764ef48332 Add logging for user cookie send for sailthru 2017-03-10 10:10:37 -05:00
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Brian Jacobel
6eda14e72e Merge pull request #14629 from edx/bjacobel/bourbon-warnings 
Quiet Bourbon deprecation warnings, UXPL upgrade 0.18.1
 2017-03-09 12:42:18 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Albert (AJ) St. Aubin
ee68726bf2 Merge pull request #14655 from edx/aj/fix_cms_style_bug 
Update to Studio style for recent capa action bar style changes
 2017-03-09 08:42:15 -05:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
Rabia Iftikhar
687a48c71d Merge pull request #14624 from edx/ri/TNL-6610-fix-more-button 
TNl-6610 Fix "more" menu on discussion post for global staff.
 2017-03-09 16:41:09 +05:00
rabiaiftikhar
ccfa3ea74d TNl-6610 Fix "more" menu on discussion post for global staff. 2017-03-09 14:16:31 +05:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Albert St. Aubin
86e202c5ab Update to Studio style for recent capa action bar style changes 2017-03-08 14:23:19 -05:00
Albert (AJ) St. Aubin
22f58606af Merge pull request #14564 from edx/aj/TNL-6347_headers 
Aj/tnl 6347 headers
 2017-03-08 13:27:40 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Noraiz Anwar
b69b586401 Merge pull request #14601 from edx/noraiz/ECOM-6939 
ECOM-6939 Fixed social auth false password-validation error
 2017-03-08 22:15:46 +05:00
Albert St. Aubin
7c7c27183f changes header levels for a11y 
TNL-6347
 2017-03-08 11:45:45 -05:00
Albert (AJ) St. Aubin
b168b04a20 Merge pull request #14640 from edx/aj/TNL-6620_action_style 
Updating the notification to remove overlap of action bar buttons
 2017-03-08 10:27:27 -05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +05:00
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
alisan617
60787393ec change to comlete flex layout 2017-03-07 13:48:46 -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
Albert St. Aubin
2693305354 Updating the notification to remove overlap of action bar buttons 2017-03-06 15:14:52 -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
Brian Jacobel
b9abeab7d5 Cheat around a Bourbon depr warning by using a private mixin 2017-03-03 14:15:16 -05:00
Brian Jacobel
a7e7a82735 Upgrade to UXPL 0.18.1 (bourbon fixes) 2017-03-03 14:00:55 -05:00
Brian Jacobel
0ad9a020f5 Remove use of the bourbon box-sizing mixin 2017-03-03 13:37:45 -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