Commit Graph

930 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release
Release 4 November 2015 to master
2015-11-04 13:19:09 -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
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
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
Afeef Janjua
713689dffe invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated
2015-10-20 18:32:21 +05:00
Clinton Blackburn
f967cfce8b Merged release to master
Resolved conflicts from hotfix-2015-10-05
2015-10-05 14:46:32 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
2015-10-05 09:35:10 -04:00
Awais
0ca586f65b If enrollment mode is credit then upgrade message should not appear.
Fixing certificates for credit mode.
ECOM-1988
2015-09-29 20:56:32 +05:00
Bill DeRusha
ccc43cfe98 Add mailchimp list fields and config for new users 2015-09-22 10:24:24 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy
TNL-3179
2015-09-18 18:02:38 +05:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview
Optimize OpenID Course Claims for users.
2015-09-17 13:35:49 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users.
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
2015-09-17 11:29:28 -04:00
Chris Dodge
410d692090 fix error where users who received a no-id-professional certificate did not get a link on his/her dashboard to download the PDF 2015-09-14 11:49:35 -04:00
Zia Fazal
f6ec9360e3 Use microsite platform_name and email_from_address if available
fixed broken test

fixes for broken tests
2015-08-28 15:24:26 +05:00
Tasawer
cefe0daa74 Updating validation error message on signup page.
ECOM-1956
2015-08-19 12:50:12 +05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard
ECOM-1917
2015-07-30 14:33:40 +05:00
Will Daly
81e677b713 Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline
Separate verification deadline from upgrade deadline
2015-07-21 09:50:53 -07:00
Will Daly
25fa2ffc2d Separate verification deadline from upgrade deadline
* Add verification deadline model.
* Populate verification deadlines from course modes table.
* Update student dashboard to use verification deadlines.
* Update pay-and-verify view to use verification deadlines.
* Simplify Django admin for course modes and add validation.
* Add verification deadline to Django admin for course modes.
* Add UI for when the upgrade deadline is missed in the pay-and-verify flow.
2015-07-21 08:43:14 -07:00
Will Daly
a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913
Credit progress page formatting bugfixes.
2015-07-20 14:14:53 -07:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes.
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
2015-07-20 13:08:13 -07:00
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
2015-07-20 13:41:19 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test
Release merge test
2015-07-20 10:38:37 -04:00
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role
Change name of method to clear up confusion with the access.has_access method.
2015-07-19 20:42:29 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type
New classes for the return type, and changes to the has_access function and tests to make them compatible.
2015-07-19 20:42:29 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00
Will Daly
e60ae31d84 Cherrypick hotfix-2015-07-07 into release candidate
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
2015-07-08 16:55:38 -04:00