Will Daly 342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests ...

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

2013-05-16 11:21:59 -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

Merge branch 'master' into feature/will/ci-lettuce-tests

2013-05-16 11:21:59 -04:00

lib

Add tags to comment service request Datadog timer

2013-05-14 14:49:56 -04:00

static

Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility

2013-05-07 11:21:44 -07:00

templates

refactoring after Python code review

2013-05-13 14:44:07 +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

Enable Delft and Georgetown to be handled by the dynamic path

2013-05-13 14:02:41 -04:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

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