Don Mitchell 9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ...

Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html

2013-02-07 14:56:48 -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

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-07 14:56:48 -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

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

base.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

component.html

studio HTML editor - codemirror/tinymce toggle work - wip

2013-01-16 14:54:28 -05:00

course_index.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

course_info.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

edit_subsection.html

studio - soft landing/nav: added in functionality/content to soft landing view and started punch list

2013-02-05 11:34:28 -05:00

edit-static-page.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

edit-tabs.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -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

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

howitworks.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

import.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

index.html

studio - soft landing UI: how it works styling - wip

2013-02-04 14:23:44 -05:00

login.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

manage_users.html

studio - course nav: added in styling to account for stateful menus

2013-02-07 11:25:11 -05:00

new_item.html

Hook up link to create modules from templates

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

overview.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

settings_discussions_faculty.html

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

settings_graders.html

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

settings.html

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

signup.html

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05: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

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -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