Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

218 Commits

Author SHA1 Message Date
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
David Ormsbee
4a70f7588e Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func 
Conflicts:
	lms/djangoapps/verify_student/models.py
	lms/djangoapps/verify_student/tests/test_models.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/urls.py
	lms/djangoapps/verify_student/views.py
	lms/envs/dev.py
	lms/templates/verify_student/face_upload.html
	lms/templates/verify_student/photo_id_upload.html
	lms/urls.py
 2013-08-22 14:07:08 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
David Ormsbee
35f66f8469 Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194 2013-07-16 09:20:35 -04:00
Felix Sun
09d3ca0ab6 Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing. 
Fixed bug when hinter module displays a hint, then is asked to display nothing.  (Used to not update in this case.)
 2013-07-02 09:40:47 -04:00
Felix Sun
0c4d6ba6d9 Made explanation for hints field in crowdsource_hinter.py more clear. 
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
 2013-07-01 11:52:52 -04:00
Carlos Andrés Rocha
0b25e76194 Improve styling of the crowdsource hinter 2013-07-01 10:34:20 -04:00
Felix Sun
aae5758a99 Edited text of crowdsourced hinter template to Piotr's suggestions. Added some HTML formatting to same. 2013-07-01 10:25:05 -04:00
Felix Sun
ab303e7567 Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 10:25:04 -04:00
Felix Sun
242d0c28ae Properly fomatted the tab-based UX for hint-voting. 
Chiseled a little at writing template tests.
 2013-07-01 10:25:04 -04:00
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 10:25:04 -04:00
Renzo Lucioni
841ff4765f Abridge tests in light of learning how Segment.io works 2013-06-18 17:58:10 -04:00
Renzo Lucioni
305e9315ef Write Jasmine tests to prove Segment.io works in Logger 2013-06-18 14:27:43 -04:00
Calen Pennington
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -04:00
Jay Zoldak
cc2cc469fe more work on jasmine tests for forums 2013-05-16 10:56:57 -04:00
Jay Zoldak
cbdf93473b start to get the jasmine tests working for comment service 2013-05-16 10:56:57 -04:00