Don Mitchell 4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor ...

Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html

2013-01-02 17:39:27 -05:00

..

emails

changed studio to edge in emails

2012-10-11 16:25:39 -04:00

registration

fix bug where activation page was blank

2012-10-15 13:52:41 -04:00

widgets

studio - course export UI alpha - roughing in states/views

2012-12-26 09:10:05 -05: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

added modal cover for editors

2012-12-13 11:28:59 -05:00

base.html

Merge pull request #1160 from MITx/feature/btalbot/cms-gradable

2012-12-14 14:09:28 -08:00

component.html

Added tool tip text to several other UI controls in templates

2012-12-10 13:32:06 -05:00

course_index.html

First stab at an import page. Needs styling

2012-10-12 11:58:43 -04:00

course_info.html

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

2012-12-07 09:45:12 -05:00

edit_subsection.html

Generalized the grader drop down and applied to edit_subsection

2012-12-19 17:31:06 -05:00

edit-static-page.html

properties changed to settings

2012-10-22 15:55:03 -04:00

edit-tabs.html

pages - made intro text visible again and styled it some

2012-12-14 16:15:01 -05:00

editable_preview.html

Added tool tip text to several other UI controls in templates

2012-12-10 13:32:06 -05:00

error.html

template for 404 and 500 errors

2012-10-11 09:58:35 -04:00

export.html

fixes on the export. There's some attributes not being handled correctly

2012-12-27 16:15:52 -05:00

import.html

clean up of users page

2012-12-13 11:28:59 -05:00

index.html

tweaked body color and window styles; adjusting new buttons

2012-12-13 11:20:30 -05:00

login.html

Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment

2012-10-25 10:47:41 -04:00

manage_users.html

clean up of users page

2012-12-13 11:28:59 -05:00

new_item.html

Hook up link to create modules from templates

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

overview.html

Bug 98: no unit tests b/c it's just text in hmtl

2012-12-26 11:47:42 -05:00

settings.html

Fix for Studio #96.

2012-12-20 14:59:21 -05:00

signup.html

more prominent log in link on sign up form

2012-10-17 12:51:48 -04:00

static-pages.html

added templates/styles for static pages

2012-10-09 14:47:15 -04:00

temp-course-landing.html

added edge logo; added edge temp landing page

2012-10-11 12:29:14 -04:00

unit.html

Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor

2013-01-02 17:39:27 -05:00

xmodule_tab_display.html

made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button

2012-11-26 14:22:13 -05:00