cahrens fae8fd3841 Merge branch 'master' into feature/christina/unify-fields ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

2013-06-13 10:55:13 -04:00

..

djangoapps

Merge branch 'master' into feature/christina/unify-fields

2013-06-13 10:55:13 -04:00

envs

Fixed use_tz not being effective in cms

2013-06-10 17:16:35 -04:00

static

syncs styling rules for buttons/inputs to ensure consistency

2013-06-12 11:43:59 -04:00

templates

Add safety check for start dates unbound

2013-06-10 17:16:34 -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

pydev_manage.py

Fixed use_tz not being effective in cms

2013-06-10 17:16:35 -04:00

urls.py

Remove proof-of-concept page

2013-05-22 15:55:51 -04:00

xmodule_namespace.py

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

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