Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,947 Commits 1 Branch 0 Tags
085de50d260310eb74c2bf6387c0e1f66362ca3f
Commit Graph

43947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Troy Sankey
085de50d26 Merge pull request #16746 from edx/pwnage101/fix-paver-tests-django-1.11-take2 
Add flags to tox.ini so paver tests can run
 2017-12-01 16:08:13 -05:00
Troy Sankey
7895c28542 Add flags to tox.ini so paver tests can run 2017-12-01 15:05:20 -05:00
Jesse Zoldak
c647ca5565 Merge pull request #16731 from edx/zoldak/better-quality-output 
Improve output for quality failures
 2017-12-01 11:51:58 -08:00
Calen Pennington
6a59df88bf Merge pull request #16694 from edx/cale/no-asset-polling 
Cale/no asset polling
 2017-12-01 14:42:56 -05:00
Matt Drayer
38930188cc Merge pull request #16740 from edx/mattdrayer/ENT-783 
mattdrayer/ENT-783: Remove 'city' from SuccessFactors OData API requests
 2017-12-01 14:27:25 -05:00
Matt Drayer
61bd579810 mattdrayer/ENT-783: Remove city from SuccessFactors OData API requests 2017-12-01 13:27:57 -05:00
Calen Pennington
f4b62b066c Don't have webpack watch node_modules or .git for changes 2017-12-01 13:06:20 -05:00
Calen Pennington
c0638ca9d3 Use file watches rather that polling for asset watching 2017-12-01 13:06:20 -05:00
edx-pipeline-bot
70dc3359a7 Merge pull request #16732 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-01 10:50:42 -05:00
Uman Shahzad
8347e6bbfb Merge pull request #16716 from open-craft/mtyaka/ENT-744 
Bump edx-enterprise to 0.55.1.
 2017-12-01 19:16:47 +05:00
Matjaz Gregoric
bc63f469a1 Bump edx-enterprise to 0.55.1. 
This updates edx-enterprise to 0.55.1 to include changes related to
enteprise tracking events.
 2017-12-01 08:39:02 +01:00
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -05:00
Tyler Hallada
989c3a30d7 Merge pull request #16618 from edx/mulby/schedules-analytics 
update readme with analytics information
 2017-11-30 16:14:36 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Dillon-Dumesnil
56062c0ea8 Merge pull request #16348 from edx/ddumesnil/xblock 
Review xBlock v1(.1.1)
 2017-11-30 15:45:18 -05:00
McKenzie Welter
b49939fb48 Merge pull request #16619 from edx/WIP-lms-bundling-button 
Program Details Page one-click purchase button with entitlements
 2017-11-30 14:53:38 -05:00
Dillon Dumesnil
3751c696be Updating version after fixing course number for Circuits 3 2017-11-30 14:46:35 -05:00
Jesse Zoldak
0bf0ba0c78 Improve output for quality failures 2017-11-30 14:43:35 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Matt Tuchfarber
c25e4ba045 Merge pull request #16648 from edx/tuchfarber/add_price_to_marketing_button 
Add pricing data to program purchase button
 2017-11-30 13:11:06 -05:00
Calen Pennington
2ad918c126 Merge pull request #16707 from cpennington/cale/improve-schedule-admin-filtering 
Use a dropdown to filter schedules by course_id, rather than forcing …
 2017-11-30 12:49:06 -05:00
Dillon Dumesnil
5afc6c6621 Updating version number after responding to Nimisha's comments in edx/xblock-review and updated header text in xblock 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
6fa8624759 Updating the version number after fixing the package data in setup.py of the Review XBlock 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
1409bca9d2 v1.0.0 release of Review XBlock 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
7b08890f00 Responding to round 3 comments. Created global variable for the url beginning 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
f5944c2e61 Improving performance of tests by creating everything but the review section prior to running tests and then creating the review section, unit, and XBlock with each test 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
2a68f9b171 Improved tests(exclamation point) 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
70fff66e42 Responding to comments 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
a3a0459de9 Switched to using unittest.skip for failing unneeded test 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
5c2caeff16 Quality fixes 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
a95d26ca94 Tests(exclamation point) 2017-11-30 12:00:04 -05:00
Dillon Dumesnil
8cbb727735 Making it so the requirements file only points to a branch and not a specific commit 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
fb233817cc v0.74 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
1992bada67 v0.73 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
ede74ad14a v0.72 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
c1795d6534 v0.71 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
96b70cf268 v0.7 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
af170ede59 v0.67 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
a6ca930497 v0.66 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
e0fcf7c1ab v0.65 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
acc68b08c2 v0.61 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
f506105e9e v0.6 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
58fb20321d v0.55 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
204a53778d v0.51 now 2017-11-30 12:00:03 -05:00
Dillon Dumesnil
37f608f6cd Trying to add Review xBlock v0.5 to Sandbox 2017-11-30 12:00:03 -05:00
Eric Fischer
e1f02977d4 Merge pull request #16723 from edx/efischer/xss_limit 
unbreak master tests
 2017-11-30 11:58:47 -05:00
Eric Fischer
bc8fa5eaaa unbreak master tests 2017-11-30 11:03:41 -05:00
Calen Pennington
1f23b08fb1 Use a dropdown to filter schedules by course_id, rather than forcing the use of search 2017-11-30 10:53:08 -05:00
Nimisha Asthagiri
7a6805b261 Merge pull request #16714 from edx/pacing/spanish-language-issue 
Schedules: course language -> closest released language
 2017-11-30 10:47:53 -05:00
Jesse Zoldak
8a7275d635 Merge pull request #16709 from open-craft/uman/xsslint 
Fix some mako-missing-default xsslint issues in test files.
 2017-11-30 06:50:04 -08:00