Chris Dodge 322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html

2012-10-04 11:03:37 -04:00

..

emails

Fix failing tests

2012-07-23 13:49:11 -04:00

jasmine

Move vendored js files into js/vendor/

2012-07-06 12:07:21 -04:00

registration

Fix failing tests

2012-07-23 13:49:11 -04:00

widgets

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page

2012-10-04 11:03:37 -04:00

activation_active.html

remove empty marketing template

2012-07-16 13:34:05 -04:00

activation_complete.html

remove empty marketing template

2012-07-16 13:34:05 -04:00

activation_invalid.html

remove empty marketing template

2012-07-16 13:34:05 -04:00

asset_index.html

static asset library template

2012-10-03 11:27:15 -04:00

base.html

Enable reordering on the unit page

2012-10-03 13:24:24 -04:00

component.html

Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module)

2012-10-03 14:24:11 -04:00

course_index.html

shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom

2012-09-28 11:42:11 -04:00

edit_subsection.html

add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget

2012-10-03 14:16:23 -04:00

editable_preview.html

First pass at integrating the new unit editing wireframes with the CMS

2012-10-01 15:17:40 -04:00

index.html

started asset library template -wip

2012-10-02 17:02:47 -04:00

login.html

consistent field labels

2012-10-03 17:23:48 -04:00

manage_users.html

support some simple authorization scheme to view/edit courses

2012-10-01 15:13:19 -04:00

new_item.html

Hook up link to create modules from templates

2012-09-25 10:10:44 -04:00

overview.html

add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget

2012-10-03 14:16:23 -04:00

signup.html

consistent field labels

2012-10-03 17:23:48 -04:00

temp-course-landing.html

more explicit temporary status on landing page

2012-10-04 10:37:46 -04:00

unit.html

Merge pull request #819 from MITx/feature/cale/cas-unit-location-view

2012-10-04 07:57:11 -07:00