Nimisha Asthagiri
d170c92f3b
Refactor course_image_url
2015-12-04 11:25:40 -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
Ned Batchelder
680271d466
Correct the darklang migration, since many darklang configs can exist.
2015-11-10 21:04:25 -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
Chris Dodge
eeb8c48922
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-10 09:41:43 -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
Clinton Blackburn
b5718289dd
Merge pull request #10525 from edx/clintonb/zendesk-logging
...
Updated Zendesk error handling
2015-11-05 13:35:41 -05:00
Clinton Blackburn
bb0effb75c
Updated Zendesk error handling
...
Properly logging exceptions so we have the complete stacktrace.
ECOM-2792
2015-11-05 11:52:53 -05:00
Robert Raposa
3682fac832
Add json escaping to Studio
...
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates
TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -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
Peter Fogg
13f20d5649
Update cert_info docstring with correct return type.
2015-11-04 10:29:27 -05:00
Eric Fischer
dc469ea5ec
Fix cert_status None. Add GeneratedCertificate to admin
2015-11-03 21:54:48 -05:00
Bill DeRusha
6123827ab1
Compare all refund dates in UTC
2015-11-02 20:00:06 -05:00
Bill DeRusha
572ea25678
Convert segment country to unicode.
2015-11-02 11:59:47 -05:00
Clinton Blackburn
c34dfac1ff
Removed read-only fields from enrollment admin
...
The read-only protection is more hassle than it's worth when testing locally and on stage. It's a solution to a problem we don't actually have, so I have reverted the changes.
2015-11-02 09:25:56 -05:00
Eric Fischer
923917c033
Merge pull request #10452 from edx/bderusha/rc-2015-11-03-bug
...
Fix dashboard page load error when cert_status is None
2015-11-01 18:17:21 -05:00
Bill DeRusha
62f3cf9c46
Fix cert_status None bug
2015-11-01 18:16:16 -05:00
jsa
c68af9d21e
Show xseries upsell even if the course is not yet in session
...
ECOM-2780
2015-11-01 15:54:33 -05:00
Ahsan Ulhaq
c47311b11f
Add the html and css and backend changes required for the xseries.
2015-10-30 20:59:26 +05:00
Bill DeRusha
1f77810fad
Add configurable refund window
...
Add configuration model for enrollment refunds.
Use order info from otto in refund window calculation
Delete dupe tests. Extend tests to include window tests
Move ecom client from lib to djangoapps in openedx
2015-10-30 09:01:53 -04:00
