Commit Graph

23143 Commits

Author SHA1 Message Date
David Ormsbee
0d67827314 Fix simple links in verification flow. 2013-08-27 19:35:46 -04:00
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
4e7885a2a2 Merge pull request #747 from edx/zoldak/fix-pylint-nose-tools
Disable pylint violation E0611 when importing assert_* from nose.tools
2013-08-27 14:00:43 -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
chrisndodge
e3810b7576 Merge pull request #799 from edx/fix/ichuang/inheritance-needs-videosequence
FIX: videosequence was not inheriting metadata, eg start date
2013-08-27 13:07:58 -07:00
Calen Pennington
42571b9319 Merge pull request #802 from cpennington/run-failed-tests
Teach rake test tasks how to re-run failed tests
2013-08-27 12:53:40 -07: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
Will Daly
88b28ae0b6 Merge pull request #808 from edx/will/randomize-cms-mongo-collections
Use randomized mongo collection names in Studio tests
2013-08-27 10:58:49 -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
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo
collection names
2013-08-27 12:57:14 -04:00
Will Daly
02cb0b487d Merge pull request #795 from edx/will/silence-doc-warnings
Silence doc test errors/warnings
2013-08-27 09:47:20 -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
Ned Batchelder
2c544cb0bd A test that our XML-comments fix works. 2013-08-27 11:44:41 -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
Ned Batchelder
ca7c002ca9 Keep comments in capa XML from causing failures
Comments (and processing instructions!) are handled oddly in lxml.
This change will keep them from causing failures.  They will be omitted
from the HTML generated, which is fine, since they aren't needed there.
2013-08-27 11:08:22 -04:00
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release'
Contains hotfix/2013-18-21
2013-08-27 11:05:13 -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
Vik Paruchuri
0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state
Fix/vik/oe state
2013-08-27 07:01:32 -07:00
Felix Sun
444f51d6de Fixed some pep/pylint violations. 2013-08-27 09:46:02 -04:00
Calen Pennington
e7626d2d84 Teach rake test tasks how to re-run failed tests 2013-08-27 09:43:30 -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
polesye
7d9607f0bd Merge pull request #800 from edx/anton/replace_subtitles_with_timed_transcript
Video Player: replace the description in the studio editing module for "subtitles" with "timed transcript"
2013-08-27 05:42:22 -07:00
Will Daly
db6d76d643 Patched textbook TOC request during course import.
Patched Snuggletex server calls
2013-08-27 08:28:15 -04:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
ichuang
83f8b033ea fix common/lib/xmodule/xmodule/modulestore/mongo/base.py 2013-08-26 20:23:11 -04:00
ichuang
4d73961a44 'videosequence' and 'proctor' need to be in inheritable moduletypes in
modulestore/mongo/base.py
2013-08-26 20:22:25 -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
Adam
4cb7863074 Merge pull request #786 from edx/adam/turn-off-password-autocomplete
Adam/turn off password autocomplete
2013-08-26 14:42:05 -07: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
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -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
Calen Pennington
bf331c9d7e Upgrade newrelic agent to the latest version 2013-08-26 12:41:04 -04:00
David Ormsbee
15b23a16e8 Merge in latest design for enrollment mode selection 2013-08-26 11:05:54 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Sarina Canelake
a374fceb77 Merge pull request #791 from edx/sarina/rake_coverage_combined
Add combined coverage to `rake coverage`
2013-08-26 07:24:46 -07:00
Sarina Canelake
269857010c Merge pull request #789 from edx/sarina/pep8_ignore_migrations
Change `rake pep8` to ignore migrations files
2013-08-26 07:17:52 -07:00