Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,909 Commits 1 Branch 0 Tags
bf8aef33fce0199661ce031ed5b0a976ff62799e
Commit Graph

8071 Commits

Author SHA1 Message Date
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
Nimisha Asthagiri
96f2253036 Merge pull request #14870 from edx/neem/rename_scores 
Rename location_to_scores -> problem_scores
 2017-04-24 13:50:54 -04:00
Michael Frey
ba1dfa1346 Merge pull request #14939 from edx/mjfrey/LEARNER-616 
Only use ecommerce hosted receipt page
 2017-04-24 13:30:08 -04:00
Clinton Blackburn
ff4d9e4360 Using shared secret for JWTs sent to Credentials API 
This change brings the Credentials API calls in line with those of other services. The change also makes it easier for the future switch to an asymmetric signing key.

LEARNER-629
 2017-04-24 12:28:23 -04:00
Nimisha Asthagiri
61c0a01b37 Rename location_to_scores -> problem_scores 2017-04-24 11:01:30 -04:00
Michael Frey
9ac4cef972 Only use ecommerce hosted receipt page 
LEARNER-616
 2017-04-24 10:46:48 -04:00
Ivan Ivic
41cfbcfb55 Enable all products to be displayed on receipt page 
LEARNER-605
 2017-04-24 12:17:28 +00:00
Cliff Dyer
579496a935 Merge pull request #14925 from edx/neem/backfill-command-waffle-override 
Allow specifying waffle switch on compute_grades
 2017-04-21 13:03:09 -04:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
J. Cliff Dyer
7c3248f95c Allow specifying waffle switch on compute_grades 
If --estimate_first_attempted is passed, it can force enabling or
disabling the ENABLE_FIRST_ATTEMPTED waffle switch.

TNL-6841
 2017-04-20 15:18:09 -04:00
Adam
64372dd53e Merge pull request #13038 from OmarIthawi/edraak/bulk-email-from-addr 
Translatable bulk_email from Address based on platform`s default lang
 2017-04-20 10:29:59 -04:00
Ivan Ivic
9ef91591fc Merge pull request #14906 from edx/iivic/LEARNER-381 
Update Order History page to reflect bundled purchase
 2017-04-20 15:47:05 +02:00
sanfordstudent
205f0723bc Merge pull request #14922 from edx/sstudent/grade_reports 
additional logging for grade reports investigation
 2017-04-20 09:37:04 -04:00
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Ahsan Ulhaq
650695845e Financial aid for courses with no course overview 
ECOM-7688
 2017-04-20 13:55:22 +05:00
Eric Fischer
5c26acc115 Re-kill ICRV block 
This reverts commit 1224e341de. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
 2017-04-19 15:55:13 -04:00
Sanford Student
edee55d3f2 additional logging 2017-04-19 15:29:23 -04:00
Cliff Dyer
28d36b5276 Merge pull request #14813 from edx/neem/backfill-problem-completion 
Estimate first_attempted for grades.
 2017-04-19 09:36:10 -04:00
rabia23
59d84e5b77 TNL-6666 Fix 500 error when entering courseware. 2017-04-19 10:45:08 +00:00
J. Cliff Dyer
4f6d5d9ce9 Estimate creation time for subsections grades based on timestamp of 
incoming scores.

TNL-6697
 2017-04-18 16:51:17 -04:00
attiyaishaque
25435cfc98 TNL-5515. Fix discussion topic navigation and sorting option. 2017-04-17 17:05:12 +05:00
Ayesha Baig
da3fb2a8d4 Pass proper 'this' context to updateSidebar method so that sidebar could resize properly on load, scroll. 2017-04-17 15:12:27 +05:00
Ahsan Ulhaq
da9d7b2e89 Merge pull request #14796 from edx/ahsan/ECOM-4776-Account-settings-page-load-and-create-user-profile 
Account settings page should load and create student user profile
 2017-04-14 14:43:09 +05:00
Rabia Iftikhar
2ee13c1221 Merge pull request #14818 from edx/ri/TNL-6740-fix-previously-cohorted-discussion-posts 
TNL-6740 Fix previously cohorted discussion posts still show cohorting visibility message.
 2017-04-14 11:38:41 +05:00
Diana Huang
196d379cc6 Rename MilestonesTransformer. 
Add comment explaining why we can't have a separate transformer.
 2017-04-13 14:39:38 -04:00
Robert Raposa
0899ac56e3 Fix review comments. 2017-04-13 14:39:38 -04:00
Diana Huang
aafd6a03ce Add 'format' as a requested field. 2017-04-13 14:39:37 -04:00
Diana Huang
9e734442c2 Initial version of new transformer. 2017-04-13 14:38:13 -04:00
Eric Fischer
8e7dc093e0 chapter_grades should be ordered 2017-04-13 11:42:49 -04:00
muhammad-ammar
cc330a8c25 disable hls profile 2017-04-13 14:51:42 +05:00
Ahsan Ulhaq
04ca94eaef Account settings page should load and create student user profile 
ECOM-4776
 2017-04-13 11:47:38 +05:00
Andy Armstrong
da1ac4664e Implement common redirect logic for all course tabs 
LEARNER-76
 2017-04-12 16:05:32 -04:00
Nimisha Asthagiri
dc036af8f3 Merge pull request #14866 from edx/neem/tests-for-grade-only-for-engaged 
Missing grades tests and don't persist when creating grades unless policy changed
 2017-04-12 14:14:32 -04:00
Nimisha Asthagiri
d852aa8b75 Missing grades tests and 
Don't persist when creating grades unless policy changed.
 2017-04-12 11:05:44 -04:00
rabia23
308fd66435 TNL-6740 Fix previously cohorted discussion posts still show cohorting visibility message. 2017-04-12 09:09:12 +00:00
Eric Fischer
7d2dbf4b76 Waffle Utils cleanup 
Turn override into a sensible default that calls both of the
for_request and in_model submethods, which are themselves still
avaiable if needed.
 2017-04-11 13:31:30 -04:00