Jean Manuel Nater 78128e7672 Merge branch 'master' into jnater/playground ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py

2013-06-18 13:36:24 -04:00

..

djangoapps

Merge branch 'master' into jnater/playground

2013-06-18 13:36:24 -04:00

envs

moving settings into the auth tokens section

2013-06-17 09:07:02 -04:00

lib

Somehow, when I moved symmath, I left behind its test files!?

2013-05-31 14:39:23 -04:00

static

lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application

2013-06-10 16:22:21 -07:00

templates

Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if.

2013-06-14 11:12:32 +03:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

one_time_startup.py

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

Merge pull request #96 from edx/nate/fix-missing-faq-route

2013-06-14 08:09:42 -07:00

wsgi.py

…

xmodule_namespace.py

Move string fields, get rid of hard-coded list of booleans.

2013-06-07 15:45:34 -04:00