Commit Graph

38173 Commits

Author SHA1 Message Date
John Eskew
10ff516fd9 Updating edx-django-release-util requirement to version 0.1.0 2016-08-11 13:55:05 -04:00
Albert (AJ) St. Aubin
28922ca688 Merge pull request #13197 from edx/aj/TNL-5051_CourseInfoAcctptanceTest
Aj/tnl 5051 course info acctptance test
2016-08-11 11:40:31 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs
Display programs of all categories on the student dashboard
2016-08-11 10:06:15 -04:00
Albert St. Aubin
b63bfbd5dd Replaced lettuce tests with bokchoy tests for the course updates page and improved flaky test issues.
TNL-5051
2016-08-11 10:04:57 -04:00
alisan617
b7c9ef9bfe Merge pull request #13210 from edx/alisan/fix-TNL-4584-trailing-text
[TNL-4584] capa numerical input trailing text
2016-08-11 09:29:55 -04:00
Kevin Kim
635c044332 Merge pull request #13140 from edx/kkim/country_tz_pref
Time Zone Field Changes Based on Country
2016-08-11 09:15:08 -04:00
sanfordstudent
3bbf30fe85 Merge pull request #13213 from edx/sstudent/TNL-4763
show English among transcript language options
2016-08-11 09:09:28 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
2016-08-11 09:00:23 -04:00
Adam
8c849c9a3d Merge pull request #13212 from edx/adam/fix-flash-path
fix path to swf file for photo verification (ECOM-5149)
2016-08-11 08:21:23 -04:00
alisan617
9a9db99720 trailing text positioning in num input type question TNL-4584 2016-08-10 18:55:27 -04:00
Christina Roberts
d2788ff2f1 Merge pull request #13207 from edx/christina/tnl-5181
Silence expected IntegrityErrors.
2016-08-10 15:46:31 -04:00
Renzo Lucioni
5fac6fb103 Merge pull request #13209 from edx/renzo/footer-logo-a11y
Make edX logo in edx.org footer more accessible
2016-08-10 15:23:24 -04:00
Kevin Kim
3af769b4ad Update time zone dropdown in account settings based on user country 2016-08-10 19:15:52 +00:00
Sanford Student
c6877aa39e one liner 2016-08-10 14:11:52 -04:00
Adam Palay
3019bc0501 fix path to swf file for photo verification (ECOM-5149) 2016-08-10 14:01:17 -04:00
Brian Beggs
a3f8cafb1d Merge pull request #12998 from mitocw/bdero/cas-django-1.8
Update django-cas dependency to support Django 1.8
2016-08-10 11:29:29 -04:00
Renzo Lucioni
b6f466b04b Make edX logo in edx.org footer more accessible
The logo in the edx.org footer now links to the edX home page, consistent with the logo in the header. ECOM-4117.
2016-08-10 10:53:05 -04:00
Sofiya Semenova
30993cde62 Merge pull request #13205 from edx/ssemenova/ORArelease
edx-ora2 1.1.7 version bump
2016-08-10 10:30:47 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course
Make studio case-insensitive for course keys for creating courses.
2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses.
ECOM-4890
2016-08-10 14:34:35 +05:00
Ned Batchelder
220cf1b48b Merge pull request #13186 from edx/ned/pin-scipy-etc
Pin versions of numpy and scipy
2016-08-09 22:09:28 -04:00
cahrens
9d8611374f Silence expected IntegrityErrors.
TNL-5181
2016-08-09 21:44:39 -04:00
ssemenova
acc5133fa8 edx-ora2 1.1.7 2016-08-09 16:36:11 -04:00
Brian Beggs
c5c06cf982 Merge pull request #13203 from edx/release
release 2016-08-09 master merge.
2016-08-09 16:06:28 -04:00
Cliff Dyer
05bfd80f05 Merge pull request #12934 from open-craft/jill/fix-bulk-email-url-scheme
Use appropriate URL scheme for bulk emails
2016-08-09 15:53:14 -04:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance
Maintenance app RequireJS
2016-08-09 23:52:01 +05:00
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
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