Brian Talbot bd98b2726a resolving local merge conflict

2013-02-14 13:00:51 -05:00

..

emails

…

registration

…

widgets

studio - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

activation_active.html

…

activation_complete.html

…

activation_invalid.html

…

asset_index.html

studio - page headers: added in logic to style page actions' height based on title having a subtitle or not

2013-02-14 09:38:32 -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 - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

edit_subsection.html

studio - hiding mast area for subsections

2013-02-14 09:00:57 -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 - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

editable_preview.html

…

error.html

…

export.html

studio - page headers: added in logic to style page actions' height based on title having a subtitle or not

2013-02-14 09:38:32 -05:00

howitworks.html

resolving local merge conflict

2013-02-14 13:00:51 -05:00

import.html

studio - page headers: added in logic to style page actions' height based on title having a subtitle or not

2013-02-14 09:38:32 -05:00

index.html

studio - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

login.html

studio - soft landing: changing 'sign into' to 'sign in to' copy

2013-02-13 12:18:27 -05:00

manage_users.html

studio - final prep of introduction areas (with fix for current page content margins)

2013-02-14 13:00:14 -05:00

new_item.html

…

overview.html

studio - page headers: resolved new course update creation JS issue caused by new markup

2013-02-14 10:52:25 -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

studio - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

settings.html

studio - adding introduction areas to all templates and infrastructure for its contnet

2013-02-14 12:49:58 -05:00

signup.html

studio - link wiring and spot styling changes for new nav/soft landing/settings work

2013-02-12 11:16:37 -05:00

static-pages.html

…

temp-course-landing.html

…

unit.html

studio - resetting Unit UI HTML back to prev version for now

2013-02-13 17:01:45 -05:00

xmodule_tab_display.html

…