Valera Rozuvan 1a9214b2f3 Fixing merge conflicts in tests.EOF ...

Fixing merge conflicts in tests.

2013-10-23 15:12:24 +03:00

..

djangoapps

Fixing merge conflicts in tests.EOF

2013-10-23 15:12:24 +03:00

envs

Add Timed Transcripts Editor.

2013-10-22 21:45:03 +03:00

static

Fix bug. Add validation to HTML5 sources field.

2013-10-23 11:52:22 +03:00

templates

Merge pull request #1111 from edx/anton/video_subtitles

2013-10-23 02:38:39 -07:00

__init__.py

…

.coveragerc

…

startup.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

urls_dev.py

pylint cleanup

2013-08-01 14:16:55 -04:00

urls.py

Merge pull request #1111 from edx/anton/video_subtitles

2013-10-23 02:38:39 -07:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

xmodule_namespace.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00