Commit Graph

14742 Commits

Author SHA1 Message Date
Adam Palay
3019bc0501 fix path to swf file for photo verification (ECOM-5149) 2016-08-10 14:01:17 -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
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 Jacobel
9a367f64fd Merge pull request #13172 from edx/bjacobel/autofix-lms
Run ESLint autofixer in LMS
2016-08-09 10:12:39 -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
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
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -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
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
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
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
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
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
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
wajeeha-khalid
ec9845b1c4 MA-2675: Skip null 'endorsed_by' in discussion requested_fields=profile_image 2016-08-04 11:08:08 +05: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
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
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 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
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
ef4c69881c Fix literal-used-as-attribute error 2016-08-03 12:44:41 -04:00
Ned Batchelder
0c8fcf6af0 Fix super-not-called errors 2016-08-03 12:44:41 -04:00
Chris Rodriguez
edfd0d6aa0 AC-549 updating pink 2016-08-03 11:10:05 -04:00
Andy Armstrong
4029e6e0d8 Merge pull request #13144 from edx/andya/update-pattern-library-colors
Update Pattern Library pages to use new color scheme
2016-08-03 10:19:02 -04:00
Ahsan Ulhaq
4c3f68cdc4 Forgot Password leak info about valid accounts
ECOM-4703
2016-08-03 14:30:00 +05:00
Andy Armstrong
7119357a07 Address code review feedback 2016-08-02 18:57:13 -04:00
Andy Armstrong
2e12214a17 Update Pattern Library pages to use new color scheme
TNL-5135
2016-08-02 18:57:13 -04:00
Renzo Lucioni
c5434c5310 Merge pull request #13125 from edx/renzo/multiple-program-types
Allow program listing page to display programs from any category
2016-08-02 13:11:23 -04:00
mikedikan
13c8e39259 Merge pull request #13147 from edx/release
Release
2016-08-02 12:29:39 -04:00
Renzo Lucioni
8196e1a024 Allow program listing page to display programs from any category
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
2016-08-01 16:47:21 -04:00
Jillian Vogel
cf8e0e4464 Uses new settings.LMS_ROOT_URL as email base url
instead of constructing it from settings.HTTPS and settings.SITE_NAME
2016-08-02 04:05:23 +09:30