ihoover 3d669eabe0 fix merge conflicts with master

2013-07-19 16:03:13 -04:00

..

djangoapps

Merge pull request #441 from edx/dhm/course_update_bugs

2013-07-19 08:56:01 -07:00

envs

remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS

2013-07-17 09:12:07 -04:00

static

Have save_item parse json formatted field values by type

2013-07-18 16:48:29 -04:00

templates

I18N work seems to have a very prominent space in the landing page

2013-07-18 21:12:49 -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

manage.py

Adding and fixing tests

2013-07-09 19:16:04 -04:00

one_time_startup.py

pylint fixes

2013-07-09 19:16:44 -04:00

pydev_manage.py

Fixed use_tz not being effective in cms

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

urls.py

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

xmodule_namespace.py

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

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