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

15545 Commits

Author SHA1 Message Date
Nimisha Asthagiri
adad6b2e83 Merge pull request #14293 from edx/beryl/pre-collect-grade-report 
Grade Report: Reuse collected block structure
 2017-01-10 13:44:24 -05:00
Jesse Zoldak
4a5426a6a7 Merge pull request #14289 from edx/zoldak/no-celery-retry-for-bok-choy 
Do not retry block structures tasks on bok choy servers
 2017-01-10 11:16:20 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Brian Jacobel
f58076e726 Don't hijack existing context to do this 2017-01-10 10:00:23 -05:00
Brian Jacobel
30f62203e2 Hide read state on profile pages. Add tests for read state generally 2017-01-10 10:00:23 -05:00
Jesse Zoldak
c25e836128 Do not retry block structures tasks on bok choy servers 2017-01-10 09:53:15 -05:00
Nimisha Asthagiri
04d4ab0e4d Grade Report: Reuse collected block structure 2017-01-09 22:04:16 -05:00
Eric Fischer
3fd86614b0 sub_api get_score return value is a dict 
This access pattern was wrong, and was causing errors in production. I've
included an additional happy-path test.
 2017-01-09 11:50:18 -05:00
Eric Fischer
a7c2a3d926 Retry on all exceptions on failed subsection grade update 2017-01-09 11:50:18 -05:00
Ned Batchelder
7be0d67546 Merge pull request #14285 from edx/ned/2017 
Happy New Year
 2017-01-07 22:34:04 -05:00
Ned Batchelder
9ff91756e5 Happy New Year 2017-01-07 20:19:51 -05:00
Anthony Mangano
69ae314dd8 enable users to select course when making support requests 
ECOM-5936
 2017-01-06 13:34:13 -05:00
Jeff LaJoie
d66e323d42 TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests 2017-01-06 08:10:31 -05:00
Ned Batchelder
e36cf4a596 Merge pull request #14272 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-05 15:13:49 -05:00
alisan617
5f0b68df4a Merge pull request #14228 from edx/alisan/response-btn-TNL-6175 
Discussion hide Add a Response button response count if zero other responses in an answered question
 2017-01-05 13:57:22 -05:00
Brian Jacobel
d9a65a9674 Merge pull request #14167 from edx/bjacobel/sequence-coffee-to-js 
Move Sequence coffee files to JS
 2017-01-05 12:45:33 -05:00
Ned Batchelder
bbef15625f Update translations (autogenerated message) 2017-01-05 16:57:06 +00:00
sanfordstudent
c18d932fa5 Merge pull request #14261 from edx/sstudent/TNL-6036 
fix auto enroll var mistake
 2017-01-05 10:36:05 -05:00
alisan617
229f112274 hide add a response button if 0 other responses 2017-01-04 16:14:29 -05:00
Simon Chen
3bda3c4a77 Remove Sailthru enrollment related signal handlers because they are being invoked from the ECOM service already. 
ECOM-6581
 2017-01-04 15:54:59 -05:00
Brian Jacobel
e98aeda29e Move sequence nav display.coffee to new js location, and remove dead code 2017-01-04 15:22:59 -05:00
Sanford Student
1a49f4e230 fix auto enroll var mistake 2017-01-04 13:37:53 -05:00
Eric Fischer
69eae7b8fb Test for missing submission score 
Follow-up to this morning's change for TNL-6236
 2017-01-03 14:47:23 -05:00
Eric Fischer
e4d32e7fea Merge pull request #14245 from edx/efischer/none_sub_score 
Submissions scores can be too quick
 2017-01-03 14:05:01 -05:00
Christopher Lee
ac2387376d Merge pull request #14233 from edx/clee/block_id 
Added block_id to course blocks API response.
 2017-01-03 12:53:00 -05:00
Gregory Martin
b816982b8e Merge pull request #14224 from edx/yro_fix-PR14078 
Fix PR 14078; fix course home regression
 2017-01-03 12:39:47 -05:00
Eric Fischer
033567752b Submissions scores can be too quick 
It's possible this score has not been logged yet, we should handle that.

TNL-6236
 2017-01-03 12:01:08 -05:00
christopher lee
abe396164c Added block_id to course blocks API response. 2017-01-03 10:40:16 -05:00
Christina Roberts
4a71af8d6e Merge pull request #14160 from edx/christina/help-menu-tests 
Add tests for context-sensitive Help button.
 2017-01-03 10:39:43 -05:00
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -05:00
Gregory Martin
bd87b218ce Fix PR 14078; fix course home regression 2017-01-03 10:15:58 -05:00
Calen Pennington
30bf20687b Merge pull request #14242 from edx/release 
Release 2016-12-22
 2017-01-03 10:11:04 -05:00
Nimisha Asthagiri
1de87f9112 Merge pull request #14213 from edx/beryl/mongocrazy 
Pre-load Definitions in Split Modulestore when accessing all blocks
 2017-01-03 09:37:40 -05:00
Zia Fazal
6274758868 Merge pull request #14215 from edx/ziafazal/WL-755 
ziafazal/WL-755: disable password reset button after click
 2016-12-30 11:14:07 +05:00
sanfordstudent
83bc318e37 Merge pull request #14235 from edx/sstudent/TNL-6214 
add verfication and enrollment to user profile report
 2016-12-29 19:43:25 -05:00
Sanford Student
5fd94a6698 add verfication status and enrollment mode to user profile report 
for TNL-6214
 2016-12-29 16:44:41 -05:00
Nimisha Asthagiri
99e6d53939 Preload definitions when collecting block structures 2016-12-29 08:51:26 -05:00
Awais Jibran
78790efdd8 Fix rescore TNL-6199 2016-12-29 11:22:27 +05:00
Anthony Mangano
57f0999b3a improve screen reader support on logistration pages 
ECOM-6107
 2016-12-27 09:33:29 -05:00
Zia Fazal
32eb016428 disable password reset button after click 
fixed quality violation
 2016-12-27 13:41:50 +05:00
Jillian Vogel
eef4539355 Merge pull request #14153 from open-craft/jill/fix-insights-ccx-staff 
Checks access using the CCX course key instead of the base course key
 2016-12-23 08:20:24 +10:30
Dmitry Viskov
fc0577d081 Hide bookmarks link in the LTI mode 2016-12-22 09:56:33 -05:00
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
Mike Dikan
8f4cf6829a Adding support for UTM Tracking to apply to free purhases 
ECOM-6450

Updating commerce api endpoint to capture user UTM cookies and resend them in the server request to the ecommerce IDA.
Currently, the non-free purchases are tracked because the user makes the request directly on ecommerce and user cookie
contains UTM data, but for free purchases, the UTM cookie isn't sent in the background server request to the ecommerce
IDA.
 2016-12-21 19:09:56 -05:00
Jillian Vogel
8493ff6028 Checks access using the CCX course key, 
instead of using the base course key (which does not contain the CCX info).
This removes the need for special checking of CCXKey/CCXLocator types, and just
treats them like normal CourseKeys.

This fix allows users with a Staff role on a CCX course to view CCX courses in Insights.
 2016-12-22 08:37:49 +10:30
Cliff Dyer
b3051ced35 Merge pull request #14195 from edx/cdyer/save-cl-data 
Save content library selected blocks during transform phase.
 2016-12-21 16:58:10 -05:00
Calen Pennington
bd87061f1c Merge pull request #14196 from edx/release 
Merge Release back into master
 2016-12-21 16:17:40 -05:00
Nimisha Asthagiri
b90c21b138 Ensure selected blocks get saved into StudentModule when running 
transform phase

TNL-6198
 2016-12-21 15:58:41 -05:00
Gregory Martin
59daa1c022 Merge pull request #14189 from edx/yro_student-acct-timezone-fix 
change variable name
 2016-12-21 15:03:09 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00