cahrens d72b6b05bf Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/static/sass/views/_static-pages.scss

2013-05-15 15:29:27 -04:00

..

djangoapps

fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test

2013-05-15 11:16:47 -04:00

envs

Install phantom-jasmine via npm, rather than git submodules

2013-05-13 11:33:09 -04:00

static

Merge branch 'master' into feature/christina/metadata-ui

2013-05-15 15:29:27 -04:00

templates

Merge branch 'master' into feature/christina/metadata-ui

2013-05-15 15:29:27 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

one_time_startup.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

urls.py

Making linters happier

2013-05-03 15:08:28 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00