Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,122 Commits 1 Branch 0 Tags
393531eb36a6445bd0518cdf6e2d9cbeb09a75da
Commit Graph

38122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Beggs
393531eb36 Merge pull request #13180 from edx/rc/2016-08-09 
Release Candidate rc/2016-08-09
 2016-08-09 13:51:07 -04:00
Andy Armstrong
e8c1b94270 Merge pull request #13198 from edx/andya/fix-load-more-link 
Fix contrast issue with "Load More" link in discussions
 2016-08-09 10:10:29 -04:00
Andy Armstrong
912760a32c Fix contrast issue with "Load More" link in discussions 2016-08-09 09:15:16 -04:00
Andy Armstrong
faa09eea10 Merge pull request #13188 from edx/andya/fix-forum-contrast-issues 
Fix color contrast issues by using new Pattern Library release
 2016-08-08 14:17:55 -04:00
Andy Armstrong
489fecb83a Fix color contrast issues by using new Pattern Library release 2016-08-08 12:45:12 -04:00
Brian Beggs
266350f72f Merge pull request #13182 from edx/efischer/add-logging 
Add Logging for CohortMembership
 2016-08-08 10:00:09 -04:00
Eric Fischer
3ba09221c1 Add Logging for CohortMembership 2016-08-05 22:15:50 -04:00
Christina Roberts
db9299cc77 Merge pull request #13177 from edx/christina/reduce-retries 
Reduce the number of retries.
 2016-08-05 11:32:02 -04:00
Asad Iqbal
5695cfecd0 Merge pull request #13178 from edx/asadiqbal08/SOL-1868 
asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page
 2016-08-05 20:18:57 +05:00
Brian Jacobel
d296eb3c11 Merge pull request #13166 from edx/bjacobel/uglify-security-upgrade 
Upgrade to Uglify 2.7.0 to remediate a security issue
 2016-08-05 11:12:55 -04:00
asadiqbal
2ee58ebe92 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-05 19:16:07 +05:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099 
WIP: initial re-add with no extra work beyond merge conflicts
 2016-08-05 09:47:27 -04:00
cahrens
7b92d3ccff Reduce the number of retries. 
This task will get run twice, 5 minutes apart. Because of that, it can run up to 6 times with max_retries set to 2.
 2016-08-05 09:34:33 -04:00
Jesse Zoldak
141980b537 Merge pull request #13176 from edx/revert-13139-asadiqbal08/SOL-1868 
Revert "asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page"
 2016-08-05 09:17:37 -04:00
Jesse Zoldak
0e5fb68e3d Revert "asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page" 2016-08-05 09:13:43 -04:00
Asad Iqbal
ffe14bb1fa Merge pull request #13139 from edx/asadiqbal08/SOL-1868 
asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page
 2016-08-05 17:38:40 +05:00
Ned Batchelder
791a65d6d5 Merge pull request #13137 from edx/ned/tweak-github-txt 
Minor improvements to the instructions in github.txt
 2016-08-05 07:10:54 -04:00
Brian Jacobel
c7042c4879 Merge pull request #13159 from edx/bjacobel/jshint-directives-to-eslint 
JSHint directives to ESLint (WIP)
 2016-08-04 17:11:56 -04:00
Renzo Lucioni
46119aca73 Merge pull request #13169 from edx/renzo/verify-now-btn 
Fix class on dashboard's verify now button
 2016-08-04 16:36:29 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Ned Batchelder
1013d1e257 Merge pull request #13168 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-04 15:49:41 -04:00
Renzo Lucioni
275a7b8872 Fix class on dashboard's verify now button 2016-08-04 15:02:02 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Andy Armstrong
7b65ba1fbc Merge pull request #13167 from edx/andya/update-pattern-library 
Update the Pattern Library for improved button styling
 2016-08-04 14:45:41 -04:00
Ned Batchelder
02f378a6ff Update translations (autogenerated message) 2016-08-04 18:25:47 +00:00
Ned Batchelder
7a0d764ef3 Update translations (autogenerated message) 2016-08-04 17:42:48 +00:00
Andy Armstrong
e493815fbf Update the Pattern Library for improved button styling 2016-08-04 13:37:11 -04:00
Brian Jacobel
24465e1ec0 Upgrade to Uglify 2.7.0 to remediate a security issue 2016-08-04 12:36:12 -04:00
Calen Pennington
8582da4a97 Merge pull request #12286 from cpennington/shards-as-valued-attributes 
Shards as valued attributes
 2016-08-04 11:13:32 -04:00
asadiqbal
839832b4f2 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-04 20:08:41 +05:00
Renzo Lucioni
504f33cfd0 Merge pull request #13162 from edx/renzo/sass-fixes 
Fix program listing and detail page styling
 2016-08-04 10:10:44 -04:00
Calen Pennington
465f82964f Merge pull request #13110 from cpennington/fix-paver-timing 
Fix paver timing
 2016-08-04 09:43:58 -04:00
wajeeha-khalid
377b2d269a Merge pull request #13156 from edx/jia/MA-2675 
MA-2675: Skip 'endorsed_by=null' in discussion requested_fields=profile_image
 2016-08-04 17:22:29 +05:00
wajeeha-khalid
ec9845b1c4 MA-2675: Skip null 'endorsed_by' in discussion requested_fields=profile_image 2016-08-04 11:08:08 +05:00
Eric Fischer
e5688f6a5a Merge pull request #13102 from edx/beryl/grade-subsections 
Robust Grades API refactor
 2016-08-03 18:10:27 -04:00
Renzo Lucioni
765792c623 Fix program listing and detail page styling 2016-08-03 16:41:21 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Calen Pennington
7a51a3052b Use @needs to specify task composition for paver service checks, so that arguments are bundled correctly 2016-08-03 16:13:11 -04:00
Calen Pennington
f3cc7bd588 Mark some side-effecting actions so that they follow the --dry-run paver flag 2016-08-03 16:13:10 -04:00
Calen Pennington
d8defaa45a Clarify how options are passed to paver tasks, so that pa11y subtasks get needed information 2016-08-03 16:13:10 -04:00
Calen Pennington
2983b3da5f Correctly pass bok-choy specific options through to the BokChoyTestSuite 2016-08-03 16:13:10 -04:00
Calen Pennington
ea28eb6197 Revert "Revert "Merge pull request #13021 from cpennington/paver-timing"" 
This reverts commit acf50c4469.
 2016-08-03 16:13:10 -04:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor 
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
 2016-08-03 15:47:16 -04:00
Chris
e641c0dcee Merge pull request #13134 from edx/clrux/ac-549 
AC-549 updating pink
 2016-08-03 14:34:30 -04:00
Ned Batchelder
7ad1a28e09 Merge pull request #13138 from edx/ned/fix-simple-pylint-errors 
Fix a number of pylint violations
 2016-08-03 13:34:11 -04:00
Ned Batchelder
b4e2af3aae Lower the pylint threshold 2016-08-03 12:45:24 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
ecffdacf5a Silence needless pylint warnings 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00