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

3494 Commits

Author SHA1 Message Date
Jesse Shapiro
424b4356a5 Merge pull request #14400 from open-craft/haikuginger/enterprise-course-consent 
[ENT-101] Add course-specific data sharing consent hooks for Enterprise app
 2017-02-09 18:37:55 -05:00
Renzo Lucioni
dda0e03f65 Merge pull request #14488 from edx/renzo/finish-catalog-transition 
Finish transition to catalog for program data
 2017-02-09 16:10:44 -05:00
Renzo Lucioni
0e06e90599 Finish transition to catalog for program data 
Updates Mako and Underscore templates as well as Backbone models and views so they work with catalog programs. Removes all remaining response munging from the back end.

ECOM-4422
 2017-02-09 14:51:26 -05:00
Jesse Shapiro
9a573de533 Add consent check to course access prerequisites; add utility functions to provide interface to course-specific consent in Enterprise app 2017-02-09 13:49:57 -05:00
Troy Sankey
6ed8dcda2c Merge pull request #14479 from edx/pwnage101/update-custom-metrics-docstrings 
improve docstrings for newrelic_custom_metrics middleware
 2017-02-07 11:24:08 -05:00
Renzo Lucioni
9be3191829 Merge pull request #14462 from edx/renzo/programs-from-catalog 
Load all programs from the catalog
 2017-02-07 10:42:17 -05:00
Renzo Lucioni
e7771148b7 Load all programs from the catalog 
This commit contains back end changes necessary to load programs from the catalog in all contexts. The existing program munging utility is applied as late as possible to avoid conflating this work with changes to the front end; those will be made separately.

ECOM-4422
 2017-02-06 23:16:29 -05:00
Troy Sankey
cb122fc027 improve docstrings for newrelic_custom_metrics middleware 
Additional comments in this commit clarifies an additional use-case for
the newrelic_custom_metrics.accumulate function: reporting a metric
without accumulation.  Also:

* Fixes docstring style to use the "google" style.
* Adds link to custom metrics table in the wiki in an attempt to help
  keep the tables in sync with the code.
* Inserts a TODO.
* other typos.
 2017-02-06 17:17:51 -05:00
David Ormsbee
da5a8b5540 New Relic metric: Enrolled courses on dashboard. 
This is so we can better map how student dashboard performance maps to
number of enrolled courses.
 2017-02-06 11:24:14 -05:00
Clinton Blackburn
1189867dd2 Removed references to ECOMMERCE_API_SIGNING_KEY 
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
 2017-02-01 01:51:21 -05:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
Saleem Latif
ab88da952b Update settings for edx-enterprise (v0.19.1) configurations. 2017-01-31 14:19:51 +05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
Renzo Lucioni
4c9066cf4e Use switch to pull programs from the catalog for the student dashboard 
ECOM-4422
 2017-01-23 15:57:59 -05:00
Eric Fischer
4b794372cd Add registration tracks as valid bulk_email targets 
Hackathon XV project
 2017-01-12 15:05:49 -05:00
Anthony Mangano
38d8017db4 more pylint fixes 2017-01-09 12:38:18 -05:00
Anthony Mangano
8e1eafd1d4 test fix 2017-01-09 11:34:05 -05:00
Anthony Mangano
4de65abbaa pylint fixes 2017-01-09 11:33:04 -05:00
Anthony Mangano
6296b0c968 clean up tests for feedback form view 2017-01-06 21:44:59 -05:00
Anthony Mangano
d3afb3c1c2 dont send blank course_ids to Zendesk or Datadog 2017-01-06 18:15:19 -05:00
Anthony Mangano
69ae314dd8 enable users to select course when making support requests 
ECOM-5936
 2017-01-06 13:34:13 -05:00
Anthony Mangano
0fd91f0739 add course_name to enrollment api reponse 
ECOM-5936
 2017-01-05 08:50:31 -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
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
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
wajeeha-khalid
b5edd01812 MA-3052: avoid catalog integration for individual course when cached 2016-12-21 10:41:29 -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
cahrens
c9fb71c4a1 Add tests for context-sensitive Help button. 2016-12-15 16:42:06 -05: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
Saleem Latif
a860d0c858 Merge pull request #14114 from edx/saleem-latif/ENT-78 
ENT-78: Update saml --pull command to raise error when it fails.
 2016-12-14 18:23:42 +05:00
noraiz-anwar
5207e2fc91 Remove access for inactive users 2016-12-14 14:26:11 +05:00
Saleem Latif
befe3052c9 Update saml --pull command to raise error when it fails. 2016-12-13 12:36:38 +05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Ben Patterson
62a9dd616d Ensure makemigrations test is called. 2016-12-08 15:22:10 -05:00
Sanford Student
5f2ffbe75b implementation of grading events 
for TNL-5045
 2016-12-07 14:47:08 -05:00
Nimisha Asthagiri
e87388e24c Grades cleanup before updating grade report 
Remove deprecated SingleSectionGrader.  TNL-5987
Remove display_name and module_id from Scores objects
Update CourseGradeFactory.__init__ to not be user-specific
Update some callers to use CourseGrade class instead of "summary" dict
Remove no longer needed course_grades.py module.
Renamed django signal from GRADES_UPDATED to COURSE_GRADE_CHANGED
 2016-11-30 12:36:25 -05:00
Toby Lawrence
205ded9918 Merge pull request #14068 from edx/release 
Merge release back into master
 2016-11-30 08:06:26 -05:00
Toby Lawrence
6cdb417019 Merge pull request #13879 from open-craft/haikuginger/disable-ccx-studio 
Remove access to CCX courses from Studio
 2016-11-28 15:44:29 -05:00
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05:00
Calen Pennington
ac2b5bccf2 Merge pull request #13717 from open-craft/smarnach/anonymous-id 
Allow to store multiple anonymous ids per (user, course)
 2016-11-22 10:11:40 -05:00
Douglas Hall
1c8e859b51 Allow for LinkedIn add to profile cert name override 2016-11-21 12:33:33 -05:00
Clinton Blackburn
d7a7bcc1d7 Setting user info cookie on learner dashboard 
The user info is now updated every time a user loads the learner dashboard. Given that this is the page most learners land on after enrolling in a course, updating this cookie here will ensure that the enrollment status hash is relatively up-to-date.

ECOM-4895
 2016-11-18 13:56:48 -05:00
Clinton Blackburn
f0030334af Added enrollment hash to login cookie 
This will allow the marketing site to determine if locally-stored enrollment data needs to be refreshed.

ECOM-4896
 2016-11-18 13:56:48 -05:00
Max Rothman
0f7f83ac1b Merge pull request #14024 from edx/release 
Merging release into master for hotfix-2016-11-17
 2016-11-18 11:34:47 -05:00
J. Cliff Dyer
b796ba1900 Add missing migrations 2016-11-17 12:11:25 -05:00
Afzal Wali
131ca13a50 Added the templates for email subject, email body and the changes in submit_feedback function that now conditionally sends emails. 
Suggestions.
 2016-11-16 12:12:00 -05:00
Ahsan Ulhaq
2157202aaf Add log info for course enrollment 
ECOM-4763
 2016-11-16 12:00:28 +05:00