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

3473 Commits

Author SHA1 Message Date
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
Sven Marnach
f5d556e745 Allow to store multiple anonymous ids for each (user, course). 2016-11-14 12:55:00 +01:00
Muhammad Ammar
71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls 
Single search request to fetch notes per unit
 2016-11-10 16:23:59 +05:00
Douglas Hall
3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization 
fix inconsistent capitalization in education drop down
 2016-11-10 05:46:00 -05:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00
Douglas Hall
ec7245537a Allow for not showing course modes on student dashboard 2016-11-09 11:39:29 -05:00
Ibrahim
122f718ce5 fix inconsistent capitalization in education drop down 2016-11-09 14:58:15 +05:00
Mushtaq Ali
237ef00a2b edxnotes stub server to support multiple usage id search - TNL-5605 2016-11-09 11:13:15 +05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
Toby Lawrence
f29a508d4f Merge pull request #13928 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-08 09:16:56 -05:00
sanfordstudent
8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 
Dashboard Final Grade Updates
 2016-11-07 16:08:06 -05:00
Toby Lawrence
3969f0cad9 Provide a default configuration for forums if none already exists. 2016-11-07 14:02:17 -05:00
Sanford Student
54df702630 Dashboard final grade display uses PersistedCourseGrade 
Will fall back to stored certificate grade if needed as we've discussed.

TNL-5314
 2016-11-07 14:00:27 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
Toby Lawrence
800daa9c1d Merge pull request #13844 from edx/PERF-386 
[PERF-386] Utilize ForumsConfig to enable and disable forums.
 2016-11-03 13:14:20 -04:00
Troy Sankey
ece785ff92 Implement the newrelic_custom_metrics middleware 
Use this middleware and its helpers to accumulate custom New Relic
metrics on a per-request basis.  If, while handling a request, the app
does not accumulate any metrics, this middleware is a very lightweight
no-op.

This commit also enables the middleware!

PERF-354
 2016-11-03 10:30:25 -04:00
Toby Lawrence
2acb4a6cad [PERF-386] Utilize ForumsConfig to enable and disable forums. 
This specifically enables/disables the underlying comment service client
used to make calls to the service.  When disabled, this client will now
throw an exception which can be propagated upwards so that callers can
make the right decision about how to notify users of the error, or
handle retry, etc etc.
 2016-11-03 10:20:19 -04:00
Jesse Shapiro
088dab365a Review changes 2016-11-01 13:04:09 -04:00
Jesse Shapiro
bd9f859419 Fix the stupid errors that copy-paste makes for 2016-11-01 11:12:54 -04:00
Jesse Shapiro
fa7c80b40a Remove access to CCX courses from Studio entirely and test that revocation 2016-11-01 09:55:45 -04:00
tasawernawaz
84314e7a14 Revert "update error messages in enrollment API" 
This reverts commit 21746f1e93.
 2016-10-28 10:12:17 +05:00