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

7789 Commits

Author SHA1 Message Date
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
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
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
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
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -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
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
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
Nimisha Asthagiri
b90c21b138 Ensure selected blocks get saved into StudentModule when running 
transform phase

TNL-6198
 2016-12-21 15:58:41 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
Calen Pennington
7f942bfc49 Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" 
This reverts commit dec4034bc5, reversing
changes made to ef55cc4f5f.
 2016-12-21 13:19:59 -05:00
Calen Pennington
07865ce087 Revert "Merge pull request #14187 from edx/jia/MA-3052" 
This reverts commit f7a0c1d901, reversing
changes made to dec4034bc5.
 2016-12-21 13:19:54 -05:00
sanfordstudent
e860205e67 Merge pull request #14191 from edx/beryl/content_library_access 
Test retrieving subsection grade after losing access to block in subsection
 2016-12-21 13:19:05 -05:00
Nimisha Asthagiri
d1d8d31bba Test retrieving subsection grade after losing access to block in subsection 2016-12-21 11:49:33 -05:00
wajeeha-khalid
b5edd01812 MA-3052: avoid catalog integration for individual course when cached 2016-12-21 10:41:29 -05:00
sanfordstudent
74a666643c Merge pull request #14151 from edx/sstudent/TNL-6178 
context manager for course id in context
 2016-12-21 09:26:28 -05:00
AsadAzam
fc79fae565 Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key 
TNL-5487 – Fix InvalidKeyError on render xblock
 2016-12-21 17:56:09 +05:00
Gregory Martin
8c0098812d Merge pull request #14078 from edx/yro_remove-datetimetext-functions 
remove datetext utils
 2016-12-20 16:17:47 -05:00
Sanford Student
ac9b8fba5e context manager for course id in context 2016-12-20 15:26:05 -05:00
Nimisha Asthagiri
f24830918c Fix Enrollment database access in Marketing Course URL PR 2016-12-20 12:03:03 -05:00
Gregory Martin
b0bf19a741 delete datetext functions, implement dateutils 2016-12-20 11:10:06 -05:00
asadazam93
01f3233a50 Fix InvalidKeyError on render xblock 2016-12-20 13:03:50 +05:00
asadiqbal
99f73dfbb3 ENT-32 Show enterprise customer branding on Logistration. 
nit: css
 2016-12-20 00:10:21 +05:00
Marko Jevtic
363a0c8d90 [SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage 2016-12-16 12:42:17 +00:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05:00
Andy Armstrong
f58d920b13 Hide the navigation bar when sorting won't work 2016-12-13 17:23:19 -05:00
Andy Armstrong
4922d7753e Clean up discussion styles to be consistent across views 2016-12-13 08:39:51 -05:00
Andy Armstrong
7287e8ef85 Fix a number of styling bugs 2016-12-12 17:07:06 -05:00
Brian Jacobel
54a9db776d Remove thread 'inline' rendering mode, make tab mode the One True Mode 2016-12-12 11:01:58 -05:00
alisan617
f5936b36ae remove Related to in inline, add it to Profile, spacing nits 2016-12-12 11:01:57 -05:00
alisan617
03d93a2e89 copy edits and profile page title 2016-12-12 11:01:57 -05:00
Brian Jacobel
787dac9046 use DiscussionThreadListView for user profile discussion 2016-12-12 11:01:56 -05:00
Brian Jacobel
187783beaf Requested UI changes - borderless, all posts is no longer highlighted 
Fix read only support for team discussions

Fix error messages to use "posts" not "threads"

More small UI tweaks, padding and alignment

Add a11y tests for all inline discussion states

Improve discussion error messages
 2016-12-12 11:01:56 -05:00
alisan617
82d05c6eb7 make new post view overlay-ish 2016-12-12 11:01:55 -05:00
Brian Jacobel
5dad2afa44 Squashed minor issue fixes in inline discussion view 
Make this selector more specific, was getting overrides

Fix Teams implementation of inline discussion

Fix LMS tests

Work on pagination support

Jasmine tests for this feature

Focus works when navigating between list and detail

Fix safe template violations
 2016-12-12 11:01:25 -05:00
Brian Jacobel
c655c5a678 Add new DiscussionInlineView which uses DiscussionThreadListView 2016-12-12 10:05:28 -05:00