Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,970 Commits 1 Branch 0 Tags
7a0d52bb00fc67b709b4f817b02cedcf08d79cca
Commit Graph

40970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
7a0d52bb00 Merge pull request #15000 from edx/diana/fix-url-name 
Use correct url helper.
 2017-04-27 16:40:04 -04:00
Nimisha Asthagiri
9e71538d33 Merge pull request #14984 from edx/neem/refactor-instructor-grades 
Refactor Grade Report in prep for parallelization
 2017-04-27 16:22:42 -04:00
Diana Huang
b10c7dfc74 Use correct url helper. 2017-04-27 15:36:34 -04:00
Matthew Piatetsky
a46453fc6a Merge pull request #14995 from edx/minor_tweaks 
ECOM-6602 Minor program progress fixes
 2017-04-27 15:22:53 -04:00
Matthew Piatetsky
fb0e9b7574 Minor program progress fixes 
ECOM-6602
 2017-04-27 14:02:32 -04:00
Matthew Piatetsky
ee98a525ee Merge pull request #14993 from edx/fix-karma-test 
Fix karma test
 2017-04-27 14:01:26 -04:00
Douglas Hall
1f8125df40 Merge pull request #14987 from edx/douglashall/add_certificates_model_admin 
Add the CertificateGenerationCourseSetting model to Django admin.
 2017-04-27 12:47:05 -04:00
Uzair Rasheed
c1e63cb086 Merge pull request #14935 from edx/uzairr/ECOM-7252-refund 
ECOM-7252-fix refund discrepancy after the course mode expiry
 2017-04-27 20:58:21 +05:00
Matthew Piatetsky
ada78f5d3b Fix failing karma test 
ECOM-6602
 2017-04-27 11:31:51 -04:00
Matthew Piatetsky
79a40eb340 Merge pull request #14974 from edx/fix_progress_css_bug 
Fix progress css bug
 2017-04-27 10:49:53 -04:00
Ned Batchelder
acf8450385 Merge pull request #14988 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-04-27 09:16:14 -04:00
Nimisha Asthagiri
379a2c181b Refactor Grade Report in prep for parallelization. 2017-04-27 08:33:01 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
Douglas Hall
690727580b Add the CertificateGenerationCourseSetting model to Django admin. 
WL-1041
 2017-04-27 06:16:55 -04:00
Muhammad Ammar
fc23e81ca1 Merge pull request #14955 from edx/ammar/educator-114-video-player-js-cleanup 
video player js cleanup
 2017-04-27 12:30:25 +05:00
Saleem Latif
76467a02d6 Merge pull request #14969 from edx/saleem-latif/ENT-306-a11y 
ENT-306: a11y feedback changes for account activation message
 2017-04-27 12:19:29 +05:00
muhammad-ammar
47490d4ee5 video player js cleanup 
EDUCATOR-114
 2017-04-27 11:14:46 +05:00
Andy Armstrong
cc98111ddb Merge pull request #14980 from edx/andya/unified-course-title 
Update unified course home page's title
 2017-04-26 17:53:17 -04:00
Cliff Dyer
da13a7db1b Merge pull request #14982 from edx/neem/batch-size-error 
Fix batch size error and kwargification of compute_v2.
 2017-04-26 17:16:42 -04:00
Andy Armstrong
3e15661d00 Update unified course home page's title 
LEARNER-694
 2017-04-26 17:02:04 -04:00
J. Cliff Dyer
77f5e2dd00 Fix batch size error and kwargification of compute_v2. 2017-04-26 16:30:27 -04:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Muhammad Ammar
3469cfc441 Merge pull request #14970 from edx/ammar/educator-126-fix-js-flaky 
fix flaky js video test
 2017-04-27 00:05:56 +05:00
Andy Armstrong
1ab0825f2e Merge pull request #14967 from edx/andya/empty-course-message 
Add an empty course message to the course home page
 2017-04-26 14:50:15 -04:00
uzairr
d5064413c1 fix of refund after course mode expiry 2017-04-26 18:29:59 +00:00
Matthew Piatetsky
932a23fbc7 Fix css bug with notification 
ECOM-6602
 2017-04-26 13:32:08 -04:00
Andy Armstrong
8c93eac6a3 Add an empty course message to the course home page 
LEARNER-27
 2017-04-26 13:16:36 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Christina Roberts
8fbf01cd9b Merge pull request #14963 from edx/christina/ed15 
Don't return Credit as an EnrollmentTrack Group.
 2017-04-26 10:58:00 -04:00
Cliff Dyer
20447bd8ad Merge pull request #14965 from edx/neem/routing-key 
Fix calling convention for celery options
 2017-04-26 10:54:07 -04:00
Clinton Blackburn
2b4817b102 Added OpenID Connect discovery endpoint 
Although we are phasing out our support of OIDC, this particular feature will allow us to eliminate many of the settings we
share across services. Instead of reading various endpoints and secret keys from settings or hardcoded values, services
with the proper authentication backend can simply read (and cache) the information from this endpoint.

ECOM-3629
 2017-04-26 10:02:27 -04:00
J. Cliff Dyer
8e409800fe Fix calling convention for celery options 2017-04-26 09:35:15 -04:00
Albert (AJ) St. Aubin
0df079a9c6 Merge pull request #13026 from OmarIthawi/edraak/goup-config-rtl 
Major RTL refactor for the group configuration in Studio
 2017-04-26 09:19:31 -04:00
Brittney Exline
2b48a5e7c5 Merge pull request #14920 from edx/bexline/registration_email 
ENT-304 Add confirm email field to registration
 2017-04-26 07:59:29 -04:00
Saleem Latif
c626f1f79a Merge pull request #14968 from edx/saleem-latif/saleem-latif-enterprise-33-8 
edx-enterprise version upgrade to 0.33.9
 2017-04-26 16:47:01 +05:00
muhammad-ammar
7da2091aaf fix flaky js video test 
EDUCATOR-126
 2017-04-26 15:45:05 +05:00
M. Rehan
19961dc750 Merge pull request #14918 from edx/mrehan/course-sharing-utm-parameters 
Add utm parameters to course sharing url
 2017-04-26 13:00:56 +05:00
Saleem Latif
20c4a758ab a11y feedback changes for account activation message 2017-04-26 12:27:47 +05:00
Saleem Latif
f4b1554c72 edx-enterprise version upgrade to 0.33.9 2017-04-26 12:12:25 +05:00
Attiya Ishaque
190a87d49d Merge pull request #14910 from edx/ai/TNL-4412-beta-tester-addition 
TNL-4412 user is not enrolled as a beta tester when account is unactivated.
 2017-04-26 12:03:47 +05:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Andy Armstrong
b06d5beddf Merge pull request #14953 from edx/andy/course-updates-page 
Implement new course updates page
 2017-04-25 18:44:06 -04:00
Renzo Lucioni
a0129ccbb6 Merge pull request #14964 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-25 16:49:40 -04:00
Andy Armstrong
6b8b79ff21 Implement new course updates page 
LEARNER-608
 2017-04-25 16:04:28 -04:00
cahrens
111b7dffd7 Don't return Credit as an EnrollmentTrack Group. 
EDUCATOR-15
 2017-04-25 15:40:22 -04:00
Brittney Exline
c2df64c3f8 ENT-304 Add confirm email field to registration 2017-04-25 18:35:29 +00:00
Christina Roberts
3908512a0b Merge pull request #14786 from OmarIthawi/omar/reset-css-rtl 
RTL fixes for HTML xmodule and the LMS reset file
 2017-04-25 14:33:49 -04:00
Christina Roberts
91f2834f62 Merge pull request #14934 from edx/iivic/Update-xblock-utils-version 
Update version of xblock-utils in requirements
 2017-04-25 14:31:41 -04:00
Calen Pennington
88dd85caec Merge pull request #14868 from cpennington/learner-542 
Store Learner language preferences into a cookie rather than the session
 2017-04-25 14:08:13 -04:00
Diana Huang
bf8aef33fc Merge pull request #14945 from edx/diana/correct-course-redirects 
Course jump tos should go to the main course home page.
 2017-04-25 13:40:31 -04:00