Andy Armstrong 538ce6d478 Fix merge problem

2014-08-07 12:16:20 -04:00

..

collections

BLD-1110: Create, edit, delete groups.

2014-07-24 08:30:21 +03:00

models

Displays release date of unit in sidebar

2014-08-07 12:16:20 -04:00

spec

Displays release date of unit in sidebar

2014-08-07 12:16:20 -04:00

spec_helpers

Backbone version of the course outline page

2014-08-07 12:16:20 -04:00

utils

Fix merge conflicts

2014-05-22 16:24:02 -04:00

views

Fix merge problem

2014-08-07 12:16:20 -04:00

base.js

Replace unit page with the container page.

2014-08-07 12:16:17 -04:00

index.js

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

main.js

whitespace changes

2013-05-08 09:29:20 -04:00

sock.js

Move sock JS code into its own file.

2013-10-15 12:59:22 -04:00