Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,181 Commits 1 Branch 0 Tags
4e7885a2a23c9ee404cf2000e584bb25ee8ac0c9
Commit Graph

17181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release' 
Contains hotfix/2013-18-21
 2013-08-27 11:05:13 -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
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
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
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
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -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
Adam
3d73ff45c7 Merge pull request #759 from edx/fix/adam/unenroll-error-logging 
fix error logging for unenrolling if enrollment not found
 2013-08-26 07:11:17 -07:00
Sarina Canelake
494ece759a Merge pull request #583 from edx/sarina/diffquality-python-path 
Add a python prefix for `diff-quality` task
 2013-08-26 07:06:49 -07:00
Sarina Canelake
ff9e01b403 Add a python prefix for diff-quality task 2013-08-26 10:05:59 -04:00
Sarina Canelake
a4d1c52ec8 Change .pep8 to ignore migrations files 2013-08-26 10:02:24 -04:00
Adam Palay
935ebc4e7a remove unused registration templates 2013-08-26 10:01:03 -04:00
Felix Sun
6e64e994f6 Fixed a test broken when the mixed modulestore was introduced. 2013-08-26 09:46:29 -04:00
Sarina Canelake
eee18c3db3 Add combined coverage to rake coverage 2013-08-26 09:42:26 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
1f9eafeede Addressed some minor PR comments. 2013-08-26 09:40:06 -04:00
Felix Sun
68bb45ab67 Added jasmine tests to crowdsource_hinter. UI is not covered; only event-inteception is covered. 2013-08-26 09:40:05 -04:00
Felix Sun
e6067d8814 Addressed PR comments. 
Fixed coffeescript event logging error.

Fixed crowdsourced hinter dependence on self.field.append() not working.
 2013-08-26 09:40:05 -04:00
Felix Sun
69fbe77dcb Fixed a rebase error in responsetypes. 
Fixed a css bug in the hinter.
 2013-08-26 09:40:05 -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
f3c3436f41 Addressing more PR comments. Fixed a test that broke when new code came in. 2013-08-26 09:40:04 -04:00
Felix Sun
d6715749dc Addressed pull request comments. 
Fixed broken tests.
 2013-08-26 09:40:04 -04:00
Felix Sun
e6db6e9ea3 Fixed bug where user isn't asked to submit a hint unless he's seen a hint. 2013-08-26 09:40:04 -04:00
Felix Sun
eb5a90a3ed Added tests for validate_answer in response types. 2013-08-26 09:40:04 -04:00
Felix Sun
544aa55e43 Added comments to explain confusing field names in crowdsource_hinter. 
Fixed some pep8 errors.
 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
d9517ea13e Fixed tests for removing hash access to hints. Fixed instructor view for same. 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
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