Commit Graph

47 Commits

Author SHA1 Message Date
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session
Update devstack settings to use new CyberSource API
2014-08-28 13:55:31 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
2014-08-15 10:26:27 -04:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode.
ECOM-41
2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
2014-08-12 18:44:40 +00:00
Diana Huang
52f9613274 Add an optional description field to course modes. 2014-08-05 09:32:39 -04:00
Diana Huang
3d942503c2 Add the ability to override non-standard verified mode names 2014-08-05 09:32:39 -04:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
Calen Pennington
f6ea16223b Allow users that have unregistered from a verified course to re-register.
Fixes LMS-2830
2014-06-11 12:37:53 -04:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
Don Mitchell
2c6437a279 Fix performance regression
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
2014-06-09 15:10:47 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Calen Pennington
3d90c83199 Call other CourseModeView methods using serialized course_id 2014-05-21 14:27:01 -04:00
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:54:49 -04:00
Julia Hansbrough
83f42f5691 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
e8196d9761 Events for entering verified flow & buying 2013-12-05 19:10:27 +00:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently.
LMS-1384
2013-11-04 10:25:28 -05:00
Diana Huang
4be5bccbcf Make sure the correct mode is chosen during upgrade
LMS-1127
2013-10-28 15:09:20 -04:00
Julia Hansbrough
16356e5cf6 Fixed LMS-1062 2013-10-25 15:23:51 -04:00
Diana Huang
e13dd094af Add an upgrade parameter to the verification views. 2013-10-25 15:21:42 -04:00
Julia Hansbrough
04bc669d09 Fixed bug LMS-1117
When registering for an verified certificate, if you selected a suggested price option, closed the browser halfway through the steps, and re-opened, the contribution would be written in the text input field instead of preselecting the appropriate radio button.  This commit fixes that behavior
2013-10-17 14:59:43 +00:00
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations
Also, deletes some unused code.
2013-09-24 17:12:31 -04:00
David Ormsbee
135f7e3b80 Make sure audit enrollments are really marked audit. 2013-09-17 10:16:22 -04:00
Diana Huang
b597cdfdae If user has previously selected a price, show it on the choose page 2013-09-10 14:35:57 -04:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE.
Enable display of course org, num in receipt page.
2013-09-10 13:32:52 -04:00
Diana Huang
238a2d53e3 Don't allow people into the verification flow if they've already been verified 2013-09-06 17:20:24 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
Diana Huang
cd479caa78 Make sure users are logged in on the verified cert path 2013-08-30 13:58:36 -04:00
Diana Huang
c96a29d77a Move course_id into the urls. 2013-08-30 12:56:47 -04:00
Diana Huang
fc52fab231 Go skip verification step if student is already verified. 2013-08-29 17:07:53 -04:00
David Ormsbee
634d207762 Make it so that auto-filling of selected price works again on confirmation screen before submitting credit card info. 2013-08-28 22:25:14 -04:00
David Ormsbee
db0af8a863 Enabled honor certificates 2013-08-28 19:21:18 -04:00
Diana Huang
e7a3847e48 More validation to the free-form price text box and allow for decimal places 2013-08-28 17:43:10 -04:00
Diana Huang
4471079f71 Clean up validation of price selection. Add error messaging. 2013-08-28 16:43:09 -04:00
David Ormsbee
7af4accc50 Preserve purchase amount choice and redisplay on final verification page. 2013-08-28 15:06:58 -04:00
David Ormsbee
48484ef9e0 move suggested price listing to common include template 2013-08-28 11:28:44 -04:00
David Ormsbee
dd50ec4e82 Merge design and dev JS/UI for verify student 2013-08-26 15:32:40 -04:00
Diana Huang
874c6314f5 Allow users who are not logged in to register. 2013-08-26 15:29:12 -04:00
David Ormsbee
cbb259eb1f Allow amounts specified to actually work for purchasing certificates 2013-08-23 11:07:06 -04:00
David Ormsbee
5422fc94ca very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:29 -04:00
David Ormsbee
0dd5819683 basic flow from enroll mode selection to verify screen 2013-08-22 13:56:23 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00