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

7051 Commits

Author SHA1 Message Date
David Ormsbee
ee8d28dacc Fix webcam capture for Firefox 2013-08-27 19:01:27 -04:00
Diana Huang
4fbf23b66a Merge pull request #810 from edx/diana/email-receipt 
Email Receipts and Billing Information
 2013-08-27 14:48:06 -07:00
Diana Huang
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
Diana Huang
d7225f026a Only store certain bits of information behind a flag. 2013-08-27 15:19:58 -04:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Felix Sun
b5e1d57e28 Merge pull request #442 from edx/felix/formula-hints 
Crowdsourced Hints - "0.2 release"
 2013-08-27 10:26:25 -07:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
David Ormsbee
256c112d02 re-add full user name to verify page 2013-08-27 11:20:44 -04:00
David Ormsbee
6447e02f02 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 
Conflicts:
	lms/templates/verify_student/photo_verification.html
 2013-08-27 11:08:38 -04:00
Frances Botsford
e6bfb887c4 more cleanup on photos for vcerts 2013-08-27 11:04:34 -04:00
Frances Botsford
28db6a2fda cleanup on the photo page for vcerts 2013-08-27 10:55:09 -04:00
Diana Huang
40393b21f7 Add in a new HTML class that represents the enrollment mode. 2013-08-27 09:42:25 -04:00
David Ormsbee
134e09b229 Remove old commented out HTML 2013-08-27 09:41:58 -04:00
David Ormsbee
6bb9360724 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 2013-08-27 09:05:18 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Brian Talbot
bae9c307ef Verification: revised semantic classes/organization - WIP 2013-08-26 19:26:28 -04:00
Brian Talbot
af8339c72d Verification: revised Sass organization - WIP 2013-08-26 19:25:52 -04:00
Frances Botsford
e5cede572a fixing up some styling on vcerts 2013-08-26 18:36:56 -04:00
David Ormsbee
0712464f50 Remove mock verify enrollment link 2013-08-26 16:02:56 -04:00
David Ormsbee
d8a693fb16 Fix to make the submission from verified to payment go through again. 2013-08-26 16:01:08 -04:00
David Ormsbee
0387d76610 Fix disable/enable buttons in verification workflow. 2013-08-26 15:48:05 -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
2012bb018f Merge branch 'ormsbee/verifyuser' into ormsbee/verify2 2013-08-26 10:05:08 -04:00
David Ormsbee
0b625a6f2a Merge branch 'ormsbee/verifyuser' into ormsbee/verify2 
Conflicts:
	lms/static/sass/views/_verification.scss
	lms/templates/verify_student/photo_id_upload.html
 2013-08-26 10:04:28 -04:00
Adam Palay
935ebc4e7a remove unused registration templates 2013-08-26 10:01:03 -04:00
Frances Botsford
770ec2dbb3 adjusting the progress bar styling for vcerts 2013-08-26 09:56:04 -04:00
Felix Sun
6e64e994f6 Fixed a test broken when the mixed modulestore was introduced. 2013-08-26 09:46:29 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
d9517ea13e Fixed tests for removing hash access to hints. Fixed instructor view for same. 2013-08-26 09:40:04 -04:00
Felix Sun
4ee8111cf4 Fixed monkey-patching persistent state bug. 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
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
Frances Botsford
b5302a192f refinements to the vcert requirements page 2013-08-23 16:49:01 -04:00
Giulio Gratta
44f4e7b10a refatoring tests and added to changelog 2013-08-23 12:59:14 -07:00
Giulio Gratta
4e77098859 added course level feature flag for forum alpha sorting as well as tests 2013-08-23 12:59:13 -07:00
Giulio Gratta
e0471007d8 removed sort in HTML and instead added conditional to use subcategory titles as sort_key 2013-08-23 12:59:13 -07:00
Akshay Jagadeesh
8cac4ebae2 Working on sorting dropdown commentables 2013-08-23 12:59:13 -07:00
David Ormsbee
da829b1681 Make client-side capture work for photo IDs 2013-08-23 13:20:25 -04:00
Frances Botsford
0fabba1553 added vcert images and some fake js functionality for photos 2013-08-23 13:08:05 -04:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
 2013-08-23 11:48:38 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
David Ormsbee
3c79e81c9d default to a min price if we loose track of how much they wanted to pay 2013-08-23 11:37:34 -04:00
David Ormsbee
cbb259eb1f Allow amounts specified to actually work for purchasing certificates 2013-08-23 11:07:06 -04:00
Frances Botsford
cb16852313 completed styling on select a track for verification 2013-08-23 10:17:52 -04:00
David Ormsbee
2cdddef924 Remove useless critical log, remove unnecessary course_id escaping. 2013-08-23 01:27:08 -04:00
David Ormsbee
8ee9a96766 quick experiment to force student verification urls to be active 2013-08-23 01:02:23 -04:00
Frances Botsford
d4e8034fca refinements on the verification html and sass 2013-08-22 23:25:57 -04:00