Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,298 Commits 1 Branch 0 Tags
02bbccd40db641de77f5aec2f406f56d2ea44d5a
Commit Graph

8183 Commits

Author SHA1 Message Date
Christina Roberts
d2653b4b17 Merge pull request #15148 from edx/christina/ed-427-again 
Christina/ed 427 again
 2017-05-31 15:31:36 -04:00
Alex Dusenbery
1a0e42af5e EDUCATOR-435 | Include enrollment status in in course and problem grade reports. 2017-05-31 15:13:51 -04:00
cahrens
106ac3a136 Change visibility to access. 
EDUCATOR-396
 2017-05-31 14:10:56 -04:00
Gregory Martin
77b2229210 GradingPolicyChanged Signal Handler 
https://openedx.atlassian.net/browse/EDUCATOR-393
 2017-05-31 10:46:55 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
Douglas Hall
d71a1d8887 Merge pull request #15038 from replaceafill/replaceafill/ENT-343 
[ENT-343] Add Terms of Service modal
 2017-05-30 10:38:50 -04:00
Qubad786
4c074f11cf Override video url with edx val encodings 2017-05-30 12:58:39 +05:00
Douglas Cerna
eaa02db6ae Added Terms of Service modal 2017-05-29 11:57:04 -06:00
John Eskew
e30e44cb9a Run isort on files touched in LicenseMixin move. 2017-05-25 16:24:57 -04:00
John Eskew
f1369b912e Move LicenseMixin and accompanying code to openedx/core/lib. 2017-05-25 16:17:31 -04:00
Andy Armstrong
643d9eda7d Merge pull request #15191 from edx/andya/use-isort 
Add isort to edx-platform
 2017-05-25 14:51:52 -04:00
John Eskew
f97f052591 Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance 
Move fields.py, inheritance.py, and partitions to openedx/core.
 2017-05-25 14:21:03 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Andy Armstrong
f81c21902e Add isort to edx-platform 
LEARNER-1168
 2017-05-25 11:39:43 -04:00
Renzo Lucioni
2955a6e639 Remove credential listing from program list view 
The new design for the program detail page introduced a sidebar which includes a program-specific listing of credentials. This is an improvement over the old list of credentials found on the program list page and is meant to replace it. The new detail page is stable, so the credential listing on the program list page can be removed.

LEARNER-492
 2017-05-22 16:07:37 -04:00
sanfordstudent
78d8895880 Merge pull request #15138 from edx/sstudent/recalculate_for_date_range 
recalculate for date range mgmt command
 2017-05-22 15:01:53 -04:00
Douglas Hall
52fbe6f1c7 Merge pull request #15144 from edx/saleem-latif/ENT-329 
ENT-329: Success Message for Account Activation for logged out users.
 2017-05-22 14:48:04 -04:00
Matt Drayer
9b4ac5ab4f Merge pull request #15142 from edx/mattdrayer/ENT-307-commerce 
ENT-307: Consider waffle switch when selecting ecommerce workflow
 2017-05-22 14:02:00 -04:00
Adam
4785b2694c Merge pull request #15153 from edx/send-emails-to-expired-tracks 
allow sending emails to course modes even if they've expired (EDUCATO…
 2017-05-22 13:21:31 -04:00
Matt Drayer
a7f6e6a56b Consider waffle switch when selecting ecommerce workflow 2017-05-22 12:25:05 -04:00
Sanford Student
78edd8522d add command 2017-05-22 10:30:37 -04:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
Cliff Dyer
1dd2530deb Merge pull request #15129 from edx/cdyer/compute_grades_seqid 
Use a stable ordering for shuffled tasks.
 2017-05-20 21:24:36 -04:00
Adam
b017229e6e Merge pull request #15141 from edx/adam/clear-tasks-old-queueing-state 
write management command to fail old tasks stuck in queueing state
 2017-05-19 18:39:32 -04:00
Adam Palay
aee4b332db write management command to fail old tasks stuck in queueing state 2017-05-19 16:12:43 -04:00
Adam Palay
1ad643acc5 allow sending emails to course modes even if they've expired (EDUCATOR-364) 2017-05-19 12:10:37 -04:00
Saleem Latif
30eba50b79 Success Message for Account Activation for logged in users 2017-05-19 20:42:40 +05:00
Jesse Shapiro
73c41388ce Merge pull request #15025 from open-craft/haikuginger/enterprise-branded-logistration 
[ENT-336][ENT-337][ENT-338] Enterprise registration/login form updates
 2017-05-18 17:20:56 -04:00
Diana Huang
3e71a45349 Only show preview bar if student can view it. 2017-05-18 09:16:28 -04:00
Jesse Shapiro
65dafe9fe5 Add Enterprise sidebar to login and registration views; remove unneeded fields; make registration form more narrow 2017-05-17 20:49:05 -04:00
Anthony Mangano
70d8c5c22c update footer endpoint in branding api to support inclusion of language selector 2017-05-17 12:33:00 -04:00
J. Cliff Dyer
1b94666c70 Use mock's ANY 2017-05-16 14:18:19 -04:00
J. Cliff Dyer
7127ab863f Use a stable ordering for shuffled tasks. 2017-05-16 12:37:51 -04:00
Cliff Dyer
af4cf7bfd9 Merge pull request #15061 from edx/neem/retry-compute-grades 
Add single retry to compute_grades tasks.
 2017-05-16 12:31:36 -04:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Renzo Lucioni
efbb5ed673 Tighten up program details view 
Condense view logic left over from removal of Waffle switch.

ECOM-6602
 2017-05-15 18:01:23 -04:00
Matthew Piatetsky
131cc0bdbb Remove old program detail page and Waffle switch gating the new page 
The new page is released and stable. The switch and old code are no longer necessary.

ECOM-7482
 2017-05-15 16:35:03 -04:00
Adam
93616b0881 Merge pull request #15108 from edx/adam/fix-bulk-email-for-track 
fix for issue where emails to students in one track are sent to users…
 2017-05-15 10:43:24 -04:00
Calen Pennington
6c4fbd3c11 Merge pull request #15088 from cpennington/footer-support-lang-variants 
Support fallback to supported language variants in the footer
 2017-05-15 09:00:00 -04:00
Adam Palay
c478e796d2 fix for issue where emails to students in one track are sent to users in other tracks, too (EDUCATOR-217) 2017-05-15 08:48:11 -04:00
Calen Pennington
03b23da980 Support fallback to supported language variants in the footer 2017-05-15 07:36:38 -04:00
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Matt Drayer
278fea9d75 Merge pull request #15055 from edx/mattdrayer/ENT-307 
ENT-307: Add waffle switch to disable account activation requirement for onboarding
 2017-05-12 09:49:46 -04:00
Adeel Khan
73e6029de7 Logging Sailthru api call time for exploring optimal connection timeout value. 
ECOM-7772
 2017-05-12 17:06:55 +05:00
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
Sanford Student
42fe9bd9b3 treat empty string as None for letter grades 2017-05-11 10:00:19 -04:00