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

39204 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
Brian Jacobel
7a071c1c6f Merge pull request #13202 from edx/bjacobel/eslint-thresh 
Lower ESLint thresholds post-autofix
 2016-08-09 13:36:52 -04:00
sanfordstudent
1c81bd146d Merge pull request #13078 from edx/sstudent/test_hide_subsection 
bokchoy test for hiding subsection after due date
 2016-08-09 12:27:16 -04:00
Brian Jacobel
cc857c6b32 Lower ESLint thresholds post-autofix 2016-08-09 12:24:22 -04:00
Brian Jacobel
ab04f537c7 Merge pull request #13200 from edx/bjacobel/abort-discussion-request 
Fix discussions error with unabortable jqXHRs
 2016-08-09 12:21:00 -04:00
Brian Jacobel
71b0ea8fef Merge pull request #13173 from edx/bjacobel/autofix-cms 
Run ESLint autofixer in CMS
 2016-08-09 12:20:45 -04:00
Brian Jacobel
98b20d1fc4 Merge pull request #13171 from edx/bjacobel/autofix-common 
Run ESLint autofixer in common
 2016-08-09 11:38:46 -04:00
Brian Jacobel
994c6caa79 Bring a bugfix from discussions feature branch over 2016-08-09 10:54:38 -04:00
Brian Jacobel
9a367f64fd Merge pull request #13172 from edx/bjacobel/autofix-lms 
Run ESLint autofixer in LMS
 2016-08-09 10:12:39 -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
Sanford Student
1289b7a6e8 bok choy test for hide subsection after due date 2016-08-09 10:01:50 -04:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Andy Armstrong
912760a32c Fix contrast issue with "Load More" link in discussions 2016-08-09 09:15:16 -04:00
Matjaz Gregoric
0dd0f1f81d Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks. 
CAPA problems have the "Staff Debug Info" button, which allows
instructors to "Reset Attempts" and "Rescore problem" for any individual
student.

XBlocks, such as Drag and Drop v2 do not support those, though the UI
was still present. Clicking any of those links would result in an
"Unknown Error Occurred" message.

This commit hides the two buttons if the associated block does not
support them.
 2016-08-09 16:28:11 +08:00
Brian Jacobel
163ff84699 Run eslint autofixer on /common 2016-08-08 15:59:18 -04:00
Brian Jacobel
d43e915dab Run eslint autofixer on /cms 2016-08-08 15:04:06 -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
Ned Batchelder
0e4b816cb1 Pin versions of numpy and scipy 2016-08-08 09:11:25 -04:00
Ned Batchelder
e3397671a2 Merge pull request #13179 from edx/ned/remove-obsolete-scripts 
Remove obsolete scripts
 2016-08-08 07:35:06 -04:00
Eric Fischer
3ba09221c1 Add Logging for CohortMembership 2016-08-05 22:15:50 -04:00
Brian Jacobel
ae8bc20b36 Run eslint autofixer on /lms 2016-08-05 15:29:20 -04:00
Brian Beggs
bcf260ce49 Merge pull request #13155 from edx/bbeggs/release-utils 
Adding edx-django-release-util to LMS and CMS
 2016-08-05 15:18:16 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
alisan617
a63da43a6e Merge pull request #13160 from edx/alisan/tnl-5074-double-arrow-user-dropdown 
remove dropdown menu class that has pseudo border that double arrows
 2016-08-05 13:49:34 -04:00
alisan617
46b94ec6be remove dropdown menu class that has pseudo border that double arrows 2016-08-05 11:46:26 -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
Ned Batchelder
aaef18ecd7 Remove obsolete scripts 2016-08-05 10:42:40 -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