Carlos Andrés Rocha 06529054de Merge hotfix 2013-07093 into master ...

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

2013-07-03 18:55:21 -04:00

..

djangoapps

Merge pull request #325 from edx/jonahstanley/fix-flakey-tests

2013-07-03 11:55:25 -07:00

lib

Merge hotfix 2013-07093 into master

2013-07-03 18:55:21 -04:00

static

Remove Segment.io whitelist from Logger

2013-07-02 13:49:33 -04:00

templates

Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing.

2013-07-02 09:54:56 -04:00

test

Remove traling commas to make json valid

2013-06-25 22:34:36 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…