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

7329 Commits

Author SHA1 Message Date
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
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
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
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
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -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
wajeeha-khalid
ec9845b1c4 MA-2675: Skip null 'endorsed_by' in discussion requested_fields=profile_image 2016-08-04 11:08:08 +05: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
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
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
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
Jillian Vogel
f28cca00f3 Uses settings.HTTPS to determine appropriate URL scheme for bulk emails 2016-08-02 03:17:56 +09:30
Jillian Vogel
0390294d3c Uses http or https appropriately in bulk email urls 
and adds system tests for affected methods.
 2016-08-02 03:17:56 +09:30
Christina Roberts
37db65fa90 Merge pull request #13131 from edx/christina/retry-celery 
Retry on failures (database locking).
 2016-08-01 12:06:46 -04:00
Adam Palay
6c743c543a fix failing test by updating require_global_staff decorator 2016-08-01 11:49:51 -04:00
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46" 
This reverts commit 27646b7e6f.
 2016-08-01 10:13:10 -04:00
John Eskew
70929ffb12 Merge pull request #13019 from mitocw/fix/aq/emit_course_published_event 
Fixed progress page update on save ccx and grade book crash issue
 2016-07-29 16:02:42 -04:00
cahrens
7efc7fe40e Retry on failures (database locking). 
TNL-5091
 2016-07-29 11:57:28 -04:00
Amir Qayyum Khan
34034aa6f5 Made ccx id unicode in app 2016-07-29 19:37:46 +05:00
Amir Qayyum Khan
d5fcb609e7 Fixed progress page update on save ccx 2016-07-29 18:11:42 +05:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
wajeeha-khalid
551fd7eef0 MA-2646: handle profile_image in requested_fields for anonymous user 2016-07-29 11:42:56 +05:00
sanfordstudent
194c5096c5 Merge pull request #13123 from edx/sstudent/milestones-fie 
Fixing test failures on master
 2016-07-28 14:59:25 -04:00
Sanford Student
03256937e6 fixing failing tests on master from enabling milestones_app feature flag 2016-07-28 14:18:45 -04:00
PaulWattenberger
59ac60f20e Merge pull request #13117 from edx/pwattenberger/ECOM-5065 
ECOM-5065 Don't retry invalid email response from Sailthru
 2016-07-28 11:15:24 -04:00
PaulWattenberger
dd4bab3cb3 ECOM-5065 Don't treat invalid email response from Sailthru as retryable error 2016-07-28 10:35:10 -04:00
sanfordstudent
7fc020761c Merge pull request #13083 from edx/tnl/enable_milestones 
Enable Milestones in LMS Tests
 2016-07-28 09:12:12 -04:00
Nimisha Asthagiri
a1a5a0fcb9 Enable Milestones in LMS Tests 2016-07-27 14:56:24 -04:00