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

19363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
14708aa30b Merge pull request #816 from edx/hotfix/xml-parsing 
Hotfix/xml parsing
 2013-08-28 09:52:48 -07:00
jkarni
fbb6dc078f Merge pull request #819 from edx/jkarni/hotfix/gzip-mimetype 
Check extension rather than mimetype
 2013-08-28 09:52:36 -07: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
Julian Arni
6cb2e0b206 Check extension rather than mimetype 2013-08-28 11:13:20 -04:00
Calen Pennington
7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi 
[DEVPAIN-7]
 2013-08-28 10:56:07 -04:00
Valera Rozuvan
869d09220c Merge pull request #771 from edx/valera/fix_empty_captions_panel_no_captions 
Valera/fix empty captions panel no captions
 2013-08-28 07:24:56 -07:00
Valera Rozuvan
0a110b672d Using native Jasmine-jQuery method to check for hidden el. 2013-08-28 17:23:42 +03:00
Ned Batchelder
e88e04d3a6 A test that our XML-comments fix works. 2013-08-28 10:15:59 -04:00
Valera Rozuvan
33fa1e2c7f Applying code changes as suggested by Anton. 
Fixed 2 failing Jasmine tests. Removed unnecessary console.log() call.
Initializing of variables in a single var statement.
 2013-08-28 17:15:52 +03:00
Ned Batchelder
6738a37ec1 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-28 10:15:48 -04:00
Valera Rozuvan
2a4f7f61c5 Remove caption panel when anything bad happens. 
Now the captions panel will be shown with captions only after successful
retrieval of captions.
 2013-08-28 17:01:02 +03:00
Valera Rozuvan
ba954ff164 Fixing code as per suggestions on PR 771. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
e788d6ce37 Added Jasmine test for bug fix. Updated comments. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
4936b5044b Fix for bug BLD-277 
"There is a white panel over a non-youtube video."
When the captions file is not specified, we simply do not render the captions panel.
 2013-08-28 17:01:02 +03:00
Ned Batchelder
3194e54400 Merge pull request #805 from edx/ned/fix-allow-comments-in-capa-xml 
Keep comments in capa XML from causing failures
 2013-08-28 06:58:51 -07:00
chrisndodge
77abfbf41e Merge pull request #813 from edx/bugfix/ichuang/course-tabs-None 
bugfix: Course static_tabs importing with display_name = "None"
 2013-08-27 18:21:27 -07:00
ichuang
493d8d26e5 add sample tabs to test_import_course 2013-08-27 20:04:55 -04:00
ichuang
4a706641f2 add test for tab names importing correctly 2013-08-27 20:03:35 -04:00
ichuang
d8345b4b39 fix course tabs from being imported with display_name=None due to overwriting policy 2013-08-27 19:39:40 -04:00
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