Calen Pennington aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-10-02 12:12:55 -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

fixed header styles

2012-10-01 16:11:04 -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

base.html

Added more styles includeing the index page more color changes and header styles

2012-07-30 09:51:49 -04:00

component.html

Make editor display immediately, and with a white background

2012-10-02 09:42:19 -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

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

styled course list page

2012-10-01 16:37:24 -04:00

login.html

styled log in form

2012-10-01 16:30:28 -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

removed visibility toggle from subsections in overview

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

signup.html

If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account.

2012-07-21 17:52:28 -04:00

unit.html

added release button; cleaned up toggle button

2012-10-01 15:51:29 -04:00