Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2373 Commits

Author SHA1 Message Date
Adam
c6b21d139a Merge pull request #11293 from edx/release 
Release
 2016-01-21 12:36:03 -05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master 
Allow each instance to configure restrictions on allowed email addresses
 2016-01-20 14:51:29 -08:00
Adam Palay
9981c86718 remove old management commands 2016-01-20 14:11:54 -05:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Bill DeRusha
754e230f63 Update change_enrollment management command to be more robust and tested 2016-01-20 12:46:56 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments." 
This reverts commit 60860e3aa8.
 2016-01-20 09:53:58 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service 
ECOM-3278
 2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
Matt Drayer
9b35844b98 mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page 2016-01-18 23:12:04 -05:00
AlasdairSwan
2676098b02 ECOM-2967 adding GA events for dashboard XSeries messages 2016-01-14 12:37:48 -05:00
Peter Fogg
fe4555bc7a Merge pull request #11151 from edx/peter-fogg/disable-audit-cert-gen 
[wip] Mark GeneratedCertificate records for audit mode as not eligible for a certificate.
 2016-01-13 07:51:56 -05:00
Peter Fogg
60860e3aa8 Disable audit certificates for new audit enrollments. 
An `eligible_for_certificate` field is added to the
GeneratedCertificate model. This way we can retain existing grading
logic, as well as maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

This commit also updates the DB cache for acceptance tests.
 2016-01-12 22:44:53 -05:00
Adam
e8925972d9 Merge pull request #11168 from edx/adam/fix-userstanding-page 
userstanding is now OneToOneField
 2016-01-08 13:36:54 -05:00
Adam Palay
7dc54723d3 userstanding is now OneToOneField 2016-01-07 15:11:23 -05:00
David Ormsbee
d23991024a Merge pull request #11144 from edx/ormsbee/student_dashboard_module_js 
Disable Courseware JS from loading on Student Dashboard.
 2016-01-06 11:33:03 -05:00
David Ormsbee
660d64d7b8 Disable Courseware JS from loading on Student Dashboard. 2016-01-05 13:54:04 -05:00
Jonathan Piacenti
acc0161c0f Add custom registration form extension feature. 2016-01-05 10:14:28 -06:00
Bill DeRusha
39b5eccf67 Update isActive column in mailchimp upon activation 2016-01-04 13:00:31 -05:00
Sarina Canelake
96ddf544ff Remove Pylint violations 2015-12-17 16:29:28 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool 
WIP for financial support tool.
 2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-16 14:17:19 -05:00
Renzo Lucioni
da16b3da22 Remove dead code 
Deletes unused code from an old implementation of microsites.
 2015-12-14 16:38:14 -05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Clinton Blackburn
27f853d605 Followup to Credit Patch 
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
 2015-12-11 15:53:18 -05:00
Bill DeRusha
a164e2fa0a Merge pull request #10934 from edx/release 
Hotfix 2015-12-09a and Hotfix 2015-12-09b
 2015-12-10 15:45:14 -05:00
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Peter Fogg
1717320b11 Merge pull request #10883 from edx/peter-fogg/investigate-spooky-migrations 
Add migrations due to field default changes from #10802.
 2015-12-08 18:57:52 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release 
Release
 2015-12-08 15:21:48 -05:00
Peter Fogg
f975ae038b Add migrations due to field default changes from #10802. 
Django 1.8 is more sensitive to model changes, and wants to create
migrations in situations that Django 1.4 would not. Changing field
defaults is an example of these situations.
 2015-12-08 10:54:49 -05:00
Zia Fazal
4f939f79f9 added new endpoint which renders certificate by uuid 
fixed broken tests and added some optimisations

fixed migration history
 2015-12-08 18:21:04 +05:00
Christine Lytwynec
b490bd168a Merge pull request #10832 from edx/clytwynec/auto-auth-redirect 
Clytwynec/auto auth redirect
 2015-12-07 15:56:23 -05:00
Christine Lytwynec
df638088ca pr fixes 2015-12-07 14:21:00 -05:00
Bill DeRusha
692e5d777a Update copy for HCFA 
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
 2015-12-07 14:18:55 -05:00
Christine Lytwynec
9f5273a7d1 pr fixes 2015-12-07 11:50:41 -05:00
Christine Lytwynec
3b217df917 add new tests for auto_auth redirecting 2015-12-04 15:04:42 -05:00
Mark Sadecki
e10614e75a adds support to auth_auth for redirecting 2015-12-04 09:45:09 -05:00
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Bill DeRusha
4b94d6367a Update dashboard banners and track selection for audit track 
Remove cert messaging from audit cert/grade info partial

move enrollment display method to helpers
 2015-12-03 13:22:08 -05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Ahsan Ulhaq
bc64c66835 Refund Policy on Prof Ed Receipts 
ECOM-2562
 2015-11-24 17:42:09 +05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Chris Dodge
02550cb368 Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts 2015-11-13 12:57:10 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Clinton Blackburn
afd682e224 Fixed admin issues 
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
 2015-11-06 01:49:22 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00