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

83 Commits

Author SHA1 Message Date
David Baumgold
0b3199d8c1 remove unused jasmine resources 2013-11-07 12:04:35 -05:00
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently. 
LMS-1384
 2013-11-04 10:25:28 -05:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
0c61f194de Verification: revises fee/honor code option-based copy 2013-09-16 13:36:02 -04:00
Frances Botsford
896ffd4e77 adjusting wording on choice expand block 2013-09-12 14:43:01 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Frances Botsford
47df7e420f ux adjustments to vcert flow 2013-09-06 12:02:37 -04:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
David Ormsbee
4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name 2013-09-05 23:39:35 -04:00
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Brian Talbot
4af4b2a022 Verification: add in I8TN support for new templates 2013-09-02 22:38:08 -04:00
Brian Talbot
822caca3f7 Verified: revises styling/presentation of alerts/errors for intro state 2013-08-30 16:03:49 -04:00
Brian Talbot
248b5a9411 Verified: visually cleans up - UI spacing, error styling, registering for badge 2013-08-30 14:27:44 -04:00
Diana Huang
c21cde37a0 Fix some urls on the choose mode page 2013-08-30 10:38:48 -04:00
Brian Talbot
db8a810009 Verified: cleans up extraneous reg selection markup and expandable UI 2013-08-29 16:45:23 -04:00
David Ormsbee
d2292738d6 Update contribution partial template with new style changes. 2013-08-29 14:47:03 -04:00
David Ormsbee
5202bdf85a Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 
Conflicts:
	common/templates/course_modes/choose.html
	lms/templates/verify_student/photo_verification.html
 2013-08-29 14:34:52 -04:00
Brian Talbot
81a56a35ab Verified: revising template UI, styling, and infrastructure 2013-08-29 14:07:51 -04:00
David Ormsbee
db0af8a863 Enabled honor certificates 2013-08-28 19:21:18 -04:00
David Ormsbee
b2141ee7c0 Add verified cert marketing link 2013-08-28 17:48:28 -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
Brian Talbot
2f3ff4b3eb Verification: revising markup for views 2013-08-28 12:57:13 -04:00
David Ormsbee
1255ea79c9 forgot to add partial template 2013-08-28 11:29:08 -04:00
David Ormsbee
48484ef9e0 move suggested price listing to common include template 2013-08-28 11:28:44 -04:00
Brian Talbot
bae9c307ef Verification: revised semantic classes/organization - WIP 2013-08-26 19:26:28 -04:00
Frances Botsford
e5cede572a fixing up some styling on vcerts 2013-08-26 18:36:56 -04:00
David Ormsbee
15b23a16e8 Merge in latest design for enrollment mode selection 2013-08-26 11:05:54 -04:00
Felix Sun
4220252055 Fixed terribly annoying issues with back button. Back button is now on 
the bottom of the hint div, no matter what.
 2013-08-26 09:40:05 -04:00
Felix Sun
2d1c9158d8 Added fancy sliding transitions into hint collection page. 2013-08-26 09:40:05 -04:00
Felix Sun
35a8e9be32 Some fixes on hint ui. 2013-08-26 09:40:05 -04:00
Felix Sun
7c93b45d0c Added wizard / slideshow style hint collection script. 
Still requires a little polishing, I think.
 2013-08-26 09:40:05 -04:00
Felix Sun
64c91cf239 UX improvements to hinting. Interface is now less cluttered. 
Hint submission is hidden behind a link, if there are hints to vote on.
 2013-08-26 09:40:05 -04:00
Felix Sun
d6715749dc Addressed pull request comments. 
Fixed broken tests.
 2013-08-26 09:40:04 -04:00
Felix Sun
e2aea75f16 Fixed a bug in recording hints shown. 
Removed the answer display next to voting.  (This was deemed distracting.)
 2013-08-26 09:40:04 -04:00
Felix Sun
8ce53ed8eb Got rid of answer signatures - these don't work with approximate answers at all. Instead, implemented comparison-based hint matching. 
Tests are broken, hint manager is probably broken.
 2013-08-26 09:40:03 -04:00
Felix Sun
6b40c5cf13 Changed hint voting ui to show all hints on one page. 
Fixed broken tests for hint manager.
 2013-08-26 09:40:03 -04:00
Felix Sun
a730f9189b Fixed numerous 500 errors that result from mal-formatted post requests. 
Fixed tests to work with symbolic answer changes.
 2013-08-26 09:40:03 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
Felix Sun
fc8acb61a3 Changed voting dialog to only display one tab per answer. 
No tests for this, yet.

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/templates/hinter_display.html
 2013-08-26 09:40:02 -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
25d9c2f385 Merge design first pass at mode choice page 2013-08-22 14:17:57 -04:00