Peter Fogg 83d84e2b65 Actually fix merge conflicts.

2013-06-20 12:40:37 -04:00

..

djangoapps

Actually fix merge conflicts.

2013-06-20 12:40:37 -04:00

envs

Merge pull request #181 from edx/renzo/segment-io-sequentials

2013-06-19 08:07:37 -07:00

lib

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

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

static

Refactor test_views from test_api. Pull out pending_tasks.js.

2013-06-18 11:19:25 -04:00

templates

Actually fix merge conflicts.

2013-06-20 12:40:37 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

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

one_time_startup.py

ummm. forgot to commit stuff

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

urls.py

Move code to instructor_task Django app.

2013-06-18 11:17:15 -04: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