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

16190 Commits

Author SHA1 Message Date
Jillian Vogel
6ca8a702ae Mask grades on progress page according to "Show Correctness" setting. 2017-05-31 16:57:38 +02: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
M. Rehan
b61a28dd75 Merge pull request #15197 from edx/mrehan/transcripts-upload-when-only-vid-id 
Override video url with edx val encodings
 2017-05-30 14:54:16 +05: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
attiyaishaque
7f3e4cb810 EDUCATOR-3 Check for course before using it. 2017-05-29 17:43:44 +05:00
Uman Shahzad
a41195377c Allow configurable activation email support link. 
This also serves as a slight refactor of ENT-392.
 2017-05-26 14:25:15 -04: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
Clinton Blackburn
800bcd8e20 Updated CredentialsApiConfig to pull URLs from settings 
Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy.

LEARNER-1103
 2017-05-25 13:30:43 -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
Anthony Mangano
8bb56fa448 Merge pull request #15133 from edx/LEARNER-842-show-language-selector-in-lms-footer 
Learner 842 Add ability to show language selector in LMS footer
 2017-05-25 10:42:01 -04:00
Douglas Hall
8f95f799ac Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting. 
WL-1052
 2017-05-24 20:24:14 -04:00
Anthony Mangano
0172ff315a add ability to show footer language selector on LMS 2017-05-24 16:41:45 -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
Renzo Lucioni
a29a118cd1 Only allow enrollment in published runs on the program detail page 
Course runs indicated to be upcoming are also restricted to those runs that are published.

LEARNER-942
 2017-05-22 11:18:53 -04:00
Sanford Student
78edd8522d add command 2017-05-22 10:30:37 -04:00
AlasdairSwan
f5ad3a7aab Merge pull request #15149 from edx/alasdair/LEARNER-1040-program-details-undeserved-congratulations 
LEARNER-1040 Only show congratulations message on the program details…
 2017-05-22 09:05:08 -04:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
Clinton Blackburn
eeac30e197 Disable Forums for Docker devstack 
This service is not currently available in Docker devstack.
 2017-05-21 11:57:55 -04: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
Douglas Hall
95510487d7 Merge pull request #15154 from edx/douglashall/ENT-392 
ENT-392 Use PLATFORM_NAME in the account activation sidebar message on the da…
 2017-05-19 15:01:55 -04:00
Robert Raposa
79300c00d7 Merge pull request #15107 from edx/rraposa/docs-cleanup 
LEARNER-909: Clean-up the edx-platform repo documentation
 2017-05-19 14:05:11 -04:00
Simon Chen
9380b6b594 Merge pull request #15151 from edx/schen/learner-490 
LEARNER-490 Disable script auto-eval on lms
 2017-05-19 13:03:41 -04:00
Douglas Hall
c1561f63a7 Use PLATFORM_NAME in the account activation sidebar message on the dashboard. 
ENT-392
 2017-05-19 12:58:16 -04:00
AlasdairSwan
a929f09013 LEARNER-1040 Only show congratulations message on the program details page once the program certificate has been earned. 2017-05-19 12:31:14 -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
Simon Chen
9135e7286d Disable script auto-eval on lms 2017-05-19 11:15:36 -04: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
Robert Raposa
de2b47ca58 Move and rename help_tokens.ini files. 2017-05-18 09:50:59 -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
Douglas Hall
d22afb8c92 Fix formatting issues with LMS account activation email. 
This removes extra whitespace in the body of the LMS account activation email.

ENT-388
 2017-05-16 12:53:43 -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