Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,244 Commits 1 Branch 0 Tags
124afe48738fb0daa327d86b790747b03e30d548
Commit Graph

2833 Commits

Author SHA1 Message Date
Bill DeRusha
3e96357867 Merge pull request #10912 from edx/bderusha/auto-deadlines-sp 
Auto setting of verification deadlines with manual overrides
 2015-12-09 13:42:19 -05:00
Bill DeRusha
522095e112 Auto setting of verification deadlines with manual overrides 2015-12-09 11:59:55 -05:00
Peter Fogg
2d40c66361 Fix spurious Zendesk warnings. 
We were logging warnings about group names when no group names were
requested. This will clean up Splunk a little bit.
 2015-12-09 10:01:14 -05:00
Peter Fogg
5ecb9af294 Merge pull request #10896 from edx/release 
Release 2015-12-08
 2015-12-08 18:58:14 -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
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -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
Braden MacDonald
dbb1887c42 Merge pull request #10839 from open-craft/custom-entry-points-provider-id 
Add additional data to custom SSO auth form extension points
 2015-12-07 20:58:24 -08: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
Chris Dodge
1592a32de3 White Labels need to still use the 'honor' course mode even through the default has changed 2015-12-06 20:36:26 -05:00
Braden MacDonald
a654d5e7ac Add additional data to custom SSO auth form extension points 2015-12-04 15:38:18 -08:00
Christine Lytwynec
3b217df917 add new tests for auto_auth redirecting 2015-12-04 15:04:42 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Mark Sadecki
e10614e75a adds support to auth_auth for redirecting 2015-12-04 09:45:09 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -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
Dan Powell
31646e4a72 Don't render unconfigured marketing links in CMS footer. 2015-12-03 13:41:53 -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
Syed Hasan raza
86227e7711 Merge pull request #10793 from edx/shr/bug/AN-4509-logging-raise-exception-UnicodeDecodeError 
Raise UnicodeDecodeError exception after logging the exception
 2015-12-03 22:54:24 +05:00
David Baumgold
3b5d9fe95a Merge pull request #10761 from jbzdak/tnl-363 
Fixes TNL-363: EdX OpenID provider doesn't handle unicode e-mails
 2015-12-03 10:17:58 -05:00
Jacek Bzdak
3506d962f8 Fix for error in TNL-363 
Audit logs were causing open_id provider logins to fail when
username or e-mail address contained unicode data.
 2015-12-03 11:27:20 +01:00
Syed Hassan Raza
395db381f6 Raise UnicodeDecodeError exception after logging the exception 2015-12-03 12:49:52 +05:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Bill DeRusha
78896c60b5 Initial migrations for verified deadlines for self paced 2015-11-30 10:30:23 -05:00
Syed Hassan Raza
0f67d19a2c Add logging for UnicodeDecodeError excpetion LoggerBackend 2015-11-27 12:07:03 +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
Kevin Falcone
80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict 2015-11-20 13:13:05 -05:00
Kevin Falcone
57a4df73a5 Management commands should no longer access args[] 
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/

Django intercepts the 'pull' argument and says "unrecognized arguments pull"
There were no tests for this command, so it wasn't noticed during the
upgrade testing, only once our integration monitoring noticed.
 2015-11-19 16:25:49 -05:00
muhammad-ammar
29acc3acfc resolve merge conflicts 
test fixes
 2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Braden MacDonald
244b8ab9de Merge pull request #10302 from open-craft/sso-login-unactivated 
SSO - Allow users to sign in with unactivated accounts (SOL-1324)
 2015-11-17 18:37:40 -08:00
Braden MacDonald
9ccf78ed06 Add some asserts and explanations, per review 2015-11-16 17:18:54 -08:00
Braden MacDonald
40448e44fa Address review comments and test failure 2015-11-16 16:11:00 -08:00
Braden MacDonald
f1bfa56884 Clean up integration tests, test logging in without activation 2015-11-16 16:11:00 -08:00
Braden MacDonald
90cdb91391 Allow users to login via third_party_auth even if not activated 2015-11-16 16:10:57 -08: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
wajeeha-khalid
4ea70aeb19 MA-862; accept application/merge-patch+json for comment/thread update 2015-11-13 12:52:21 +05:00
Saleem Latif
c068bc95cf Custom 500 error message should only be seen for Preview 2015-11-12 11:31:25 +05:00
Ned Batchelder
e7fcc743c0 More-correct data migrations 
We need to be sure the migrations will work even in the presence of data
from the future.  get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
 2015-11-11 09:03:21 -05:00
muhammad-ammar
f55f9af891 Fix RemovedInDjango19Warning 2015-11-11 13:58:07 +05:00