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

1243 Commits

Author SHA1 Message Date
Peter Fogg
a7b1f79d3e Better error logging for full courses during enrollment. 
ECOM-3685
 2016-02-11 09:54:15 -05:00
Douglas Hall
907d3e9f08 Merge pull request #11379 from edx/hasnain-naveed/HOL-44-extented 
HOL-44 / Added check for duplication of email
 2016-01-30 07:19:07 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Hasnain
0971e3715a Added check for duplication of email 2016-01-29 14:01:07 +00:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization 
changes after feedback from matte
 2016-01-28 14:26:48 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service 
ECOM-3278
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Bill DeRusha
f59144b7e3 Merge pull request #11207 from edx/bderusha/yob-fix 
Update age calculation to be more conservative.
 2016-01-27 10:48:47 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Bill DeRusha
77668afa11 Update age calculation to be more conservative. 2016-01-26 13:19:51 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to 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.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
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