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

8110 Commits

Author SHA1 Message Date
Noraiz Anwar
3c0e02067d Merge pull request #14954 from edx/noraiz/TNL-6870 
TNL-6870 Add masquerading feature for preview mode
 2017-05-05 18:58:47 +05:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode 
Unicode fixes for django_comment_client and request_cached decorator
 2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
noraiz-anwar
d78d52e132 Add masquerading feature for preview mode 2017-05-03 18:50:50 +05:00
sanfordstudent
bcc3d16589 Merge pull request #14929 from edx/neem/capa-refactor 
Refactor CAPA to use scorable XBlock mixin
 2017-05-02 09:43:06 -04:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
J. Cliff Dyer
ea0027f338 refactor CAPA to use scorable xblock mixin 
for TNL-6594
 2017-05-01 15:08:17 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Cliff Dyer
ea9fe1de62 Merge pull request #15004 from edx/neem/shuffled-backfill-tasks 
Shuffle tasks.
 2017-05-01 09:17:51 -04:00
J. Cliff Dyer
1daa4eadd5 Shuffle tasks. 2017-04-28 14:19:21 -04:00
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
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
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
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -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
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
Nimisha Asthagiri
379a2c181b Refactor Grade Report in prep for parallelization. 2017-04-27 08:33:01 -04:00
Douglas Hall
690727580b Add the CertificateGenerationCourseSetting model to Django admin. 
WL-1041
 2017-04-27 06:16:55 -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
uzairr
d5064413c1 fix of refund after course mode expiry 2017-04-26 18:29:59 +00: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
J. Cliff Dyer
8e409800fe Fix calling convention for celery options 2017-04-26 09:35:15 -04: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
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
6b8b79ff21 Implement new course updates page 
LEARNER-608
 2017-04-25 16:04:28 -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
Diana Huang
c14f0b14ea Course jump tos should go to the main course home page. 2017-04-25 11:33:14 -04:00
Nimisha Asthagiri
6ee7f409f2 Merge pull request #14952 from edx/neem/refactor-grade-report 
Refactor Instructor Tasks - in prep for Grade report work
 2017-04-25 11:18:37 -04:00
Nimisha Asthagiri
6cdfeb98cb Merge pull request #14946 from edx/neem/refactor_grades_misc 
Grades API misc cleanup
 2017-04-25 10:14:25 -04:00
Rabia Iftikhar
1b6778f694 Merge pull request #14932 from edx/ri/TNL-6666-500-error-courseware 
update log info
 2017-04-25 17:05:22 +05:00
Michael Frey
77a347c1ab Merge pull request #14950 from edx/mjfrey/LEARNER-616 
Only use ecommerce hosted receipt page
 2017-04-25 07:23:31 -04:00
Nimisha Asthagiri
18433dab95 Refactor Instructor Tasks - in prep for Grade report work 2017-04-24 19:35:06 -04:00
Michael Frey
c8b5dc06da Only use ecommerce hosted receipt page 
LEANER-616
 2017-04-24 19:25:21 -04:00
Andy Armstrong
b3a9689dc3 Merge pull request #14949 from edx/andya/course-sidebar 
Add a sidebar to the new course home page
 2017-04-24 19:17:24 -04:00
Nimisha Asthagiri
16114f585b Miscellaneous grades code cleanup - pending from previous PRs 2017-04-24 17:58:18 -04:00
Andy Armstrong
25229a741b Implement course handouts 
LEARNER-607
 2017-04-24 17:47:47 -04:00
Andy Armstrong
e7e7b3bc15 Add a sidebar to the new course home page 
LEARNER-606
 2017-04-24 14:52:42 -04:00
Michael Frey
b2dcc9c49b Revert "Only use ecommerce hosted receipt page" 2017-04-24 14:39:07 -04:00
rabia23
186e820b3d update log when there's an IndexError on loading courseware 
raise IndexError after catching it
 2017-04-24 14:31:58 -04:00
Qubad786
c28d7cd5f9 Add utm parameters to course sharing url 2017-04-24 23:01:21 +05:00