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

36535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Falcone
ea522a1797 Merge pull request #12288 from edx/jibsheet/paver-migrate-multiple-dbs 
Switch to using the standard edxapp-migrate-(lms|cms) tools
 2016-04-28 21:50:41 -04:00
Robert Raposa
1dfe0e8a4e Merge pull request #12254 from edx/robrap/linter-javascript-context 
TNL-4427: Add additional JavaScript context tags
 2016-04-28 18:00:20 -04:00
Robert Raposa
17a920b3a6 Merge pull request #12246 from edx/robrap/safe-commit 
TNL-4317: Add helper for checking git commit is safe
 2016-04-28 16:54:38 -04:00
Ned Batchelder
4cc4e6559c Merge pull request #12295 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-28 12:22:33 -04:00
Robert Raposa
b67c133910 Add additional JavaScript context tags 2016-04-28 12:16:10 -04:00
Ben Patterson
a61707b8e6 Merge pull request #12272 from edx/benp/shard4-lms 
Create a 4th shard for lms unit tests
 2016-04-28 11:18:43 -04:00
AlasdairSwan
265f2490a1 Merge pull request #12294 from edx/alasdair/ECOM-3200-resolve-id-issue 
Renamed 'programId' to use 'id'
 2016-04-28 11:04:33 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
Robert Raposa
ac935e02a6 Add script for checking git commit is safe 2016-04-28 10:52:43 -04:00
Kevin Falcone
b7e070e0b9 Switch to using the edxapp-migrate-(lms|cms) tools 
edxapp-migrate-lms figures out at system build time what databases
it needs to migrate (just default, or default + student_module_history).
This avoids paver needing to be clever about figuring out if a user has
enabled the split CSMHE databases flag and permits this to merge early
and safely.

We can turn the CSMHE flag on from configuration at the same time we
enable all of the database config and ensure that the new database is
created.  Until a devstack is provisioned using that version of
configuration, it'll continue to have 1 DB and migrate 1 DB.  This
allows us to better control deployment.
 2016-04-28 10:48:06 -04:00
Kevin Falcone
01e0806334 Merge pull request #12282 from edx/jibsheet/upgrade-new-relic 
Come up to a newer New Relic version.
 2016-04-28 10:23:45 -04:00
Ben Patterson
1db84e79df Additional shard balancing changes for unit tests. 2016-04-28 10:09:32 -04:00
Ben Patterson
ddbd7f9174 Designate 4th shard. 2016-04-28 10:09:32 -04:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-04-28 10:09:32 -04:00
AlasdairSwan
61a5cd4d8f Renamed 'programId' to use 'id' 2016-04-28 09:44:08 -04:00
Ayub khan
9376c67360 Merge pull request #12293 from edx/revert-12144-SUST-35-course_key_from_string_or_404 
Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404"
 2016-04-28 18:38:16 +05:00
Robert Raposa
271f8233fb Merge pull request #12236 from edx/robrap/linter-python 
TNL-4326: Add Python linting
 2016-04-28 09:07:36 -04:00
clrux
1aab751609 Merge pull request #12284 from edx/clrux/removing-outline-from-main 
Removing the focus outline for the main container in LMS
 2016-04-28 07:19:49 -04:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
Waheed Ahmed
91d3b0bd24 Merge pull request #12271 from edx/waheed/ecom-4292-add-kosovo-to-country-list 
Added Kosovo in django country list.
 2016-04-28 11:59:24 +05:00
Robert Raposa
374dcb3264 Add Python linting 2016-04-27 17:40:30 -04:00
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
Chris Rodriguez
746cae2c9a Removing the focus outline for the main container in LMS 2016-04-27 14:32:37 -04:00
John Eskew
625e76a595 Merge pull request #12262 from edx/jeskew/pillow_upgrade 
Upgrade pillow.
 2016-04-27 14:17:17 -04:00
David Ormsbee
0acccf2fd4 Merge pull request #12280 from edx/release 
Release to Master (2016-04-26 release)
 2016-04-27 14:05:12 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
19b9242986 Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates 
Fix errors in old Django templates / migrate to Mako
 2016-04-27 13:39:54 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00
Kevin Falcone
77f52d4259 Come up to a newer New Relic version. 
This supports a number of their new Error features.
 2016-04-27 12:32:11 -04:00
David Ormsbee
7d7d5a160d Merge pull request #12232 from edx/rc/2016-04-26 
Release Candidate rc/2016-04-26
 2016-04-27 12:23:34 -04:00
Brian Jacobel
0f1366a7fb Merge pull request #12251 from edx/bjacobel/use-unminified-assets 
Use unminified picturefill in development
 2016-04-27 12:12:43 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Brian Jacobel
12d65f5801 Use unminified picturefill in development 2016-04-27 10:23:07 -04:00
Ahsan Ulhaq
edb356a43a Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Revert "Add js test for analytics event on LMS receipt page"
 2016-04-27 18:38:45 +05:00
John Eskew
8354e6d79c Fix quality issue. 2016-04-27 09:27:36 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress 
Measuring program progress
 2016-04-27 09:24:09 -04:00
Ahsan Ulhaq
5f6474ac7d Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit 785b752d19.
 2016-04-27 17:38:51 +05:00
Muzaffar yousaf
d97b3cbd1f Merge pull request #12037 from edx/fedx/upgrade-backbone 
Upgrade backbone via npm.
 2016-04-27 17:31:00 +05:00
clrux
c6a4c23123 Merge pull request #12260 from edx/clrux/ac-400 
AC-400 removing tabindex from bookmark
 2016-04-27 07:23:30 -04:00
Ahsan Ulhaq
be6aea179a Merge pull request #12238 from edx/ahsan/ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page 
Add js test for analytics event on LMS receipt page
 2016-04-27 15:33:29 +05:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
Ehtesham
c87821446b CMS event fixes required to upgrade backbonejs 2016-04-27 12:48:46 +05:00
Ehtesham
59e1cafc02 CMS fixes required to upgrade backbonejs 2016-04-27 12:48:45 +05:00
muzaffaryousaf
a1cb7b8f39 Common, squire fixes required to upgrade backbonejs 
TNL-4358
 2016-04-27 12:48:45 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Muddasser
d670f8c4da Merge pull request #12257 from edx/muddasser/bokchoy/chrome/test_if_captions_are_draggable 
branch out at assert based on chrome and firefox
 2016-04-27 12:03:55 +05:00
Muddasser
1220a0a98b Merge pull request #12259 from edx/muddasser/bokchoy/chrome/screenshots_test 
Changed screenshots to incorporate firefox and chrome
 2016-04-27 12:03:37 +05:00
Douglas Hall
9eefe6a947 Merge pull request #12264 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_6 
Upgrade xblock_lti_consumer to 1.0.6
 2016-04-26 21:05:30 -04:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error 
MA-2305
 2016-04-26 20:21:08 -04:00