Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,093 Commits 1 Branch 0 Tags
799e2bb4e4957dd3a2d2e77c92fcf787c19a6060
Commit Graph

42093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00
Calen Pennington
20caf52bea Use the existing user object in the case where a user is making changes to their own preferences 2017-04-28 12:26:39 -04:00
Eric Fischer
5e3f5f11ca Update edx-ora2 to 1.4.0 2017-04-28 11:02:24 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
M. Rehan
ce93ad2af4 Merge pull request #14973 from edx/mrehan/educator-122-enable-course-sharing-in-future-courses 
EDUCATOR-112 – Enable sharing icons for future courses
 2017-04-28 18:33:53 +05:00
M. Rehan
3ffde4a425 Merge pull request #14766 from edx/mrehan/add-flag-for-lti-xblock 
TNL-6688 – Add flag to control lti-consumer-xblock's request username/email editing in Studio
 2017-04-28 18:33:30 +05:00
Qubad786
f3b4803066 Update lti_consumer xblock to latest version 2017-04-28 15:59:23 +05:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
M. Rehan
6ea581793d Merge pull request #14810 from edx/mrehan/create-or-update-overview-on-course-publish 
TNL-6601 – Create or update course overview on a course publish
 2017-04-28 15:45:58 +05:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Qubad786
fad53592d2 Create or update course overview on a course publish event received from studio. 2017-04-28 14:31:45 +05:00
Ahsan Ulhaq
401eac8fa8 Merge pull request #14971 from edx/ahsan/ECOM-4478-Stop-program-cert-awarding-task-from-retrying-on-4xx 
Stop program cert awarding if cert is not configured in credentials
 2017-04-28 13:57:40 +05:00
Douglas Cerna
927c5d3789 Set MEDIA_ROOT and MEDIA_URL in cms.envs.aws module 2017-04-27 16:14:36 -06:00
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
Ben Patterson
4d3f4f8596 Update bok_choy_data_default.json 
Fix errors
 2017-04-27 16:04:38 -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
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Ben Patterson
7bafafac84 Update bok-choy cache files. 
This should provide some performance improvements when running
bok-choy tests, particularly during set-up.
 2017-04-27 14:44:38 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -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
Ahsan Ulhaq
b6993c392d Stop program cert awarding if cert is not configured in credentials 
ECOM-4478
 2017-04-27 20:13:17 +05: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
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -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