cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

emails

changed studio to edge in emails

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

js

Migrated internationalization text into template for section name

2013-05-22 15:55:55 -04:00

registration

fix bug where activation page was blank

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

widgets

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

404.html

remove import and shortened line length

2013-03-18 15:10:17 -04:00

500.html

more copy tweaks

2013-05-11 16:16:30 -04:00

activation_active.html

Change url for login from login to signin.

2013-02-15 17:30:24 -05:00

activation_complete.html

Change url for login from login to signin.

2013-02-15 17:30:24 -05:00

activation_invalid.html

remove empty marketing template

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

asset_index.html

removed symbolset, replaced with fontawesome for asset upload

2013-05-22 15:55:47 -04:00

base.html

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

checklists.html

Studio: style reorg

2013-05-14 17:15:07 -04:00

component.html

Some i18n work and other minor cleanup.

2013-05-17 14:57:25 -04:00

course_info.html

removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style

2013-05-22 15:55:48 -04:00

edit_subsection.html

Studio: style reorg

2013-05-14 17:15:07 -04: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

removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons

2013-05-22 15:55:48 -04: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: style reorg

2013-05-14 17:15:07 -04:00

howitworks.html

removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons

2013-05-22 15:55:48 -04:00

import.html

Studio: style reorg

2013-05-14 17:15:07 -04:00

index.html

removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons

2013-05-22 15:55:48 -04: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

removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style

2013-05-22 15:55:48 -04:00

new_item.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

overview.html

Restore HTML escaping in Mako template

2013-05-22 15:55:55 -04:00

settings_advanced.html

removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files

2013-05-22 15:55:55 -04: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

removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style

2013-05-22 15:55:48 -04:00

settings.html

removed symbolset, replaced with fontawesome for settings

2013-05-22 15:55:48 -04: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

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

Get rid of empty, store ID.

2013-05-21 14:29:33 -04: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