Dennis Jen 47f3252215 Merge pull request #6529 from edx/release ...

Merge release back into master

2015-01-09 17:22:15 -05:00

..

dev

Create urls/views/templates for dev-only views

2013-07-31 17:20:26 -04:00

emails

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

js

fixing styling and class syntax (to new FA-based classes) for missing UI elements

2015-01-09 12:01:26 -05:00

registration

Miscellaneous fixes to strings found during i18n work.

2014-01-03 17:50:16 -05:00

ux/reference

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

widgets

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05:00

404.html

fix for Studio 404 and 500 page layouts

2014-05-02 16:19:59 -04:00

500.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

activation_active.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

activation_complete.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

activation_invalid.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

asset_index.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

base.html

Replace "edX Studio" with "{studio_name}"

2014-12-19 13:58:42 -05:00

checklists.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

component.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

container.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

course_info.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

course_outline.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

course-create-rerun.html

Add aria-disabled attribute

2015-01-06 17:21:49 +05:00

edit-tabs.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

error.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

export_git.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

export.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

group_configurations.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

howitworks.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

html_error.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

import.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

index.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

login.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

manage_users.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

register.html

fix studio templating errors

2015-01-08 19:47:15 -05:00

settings_advanced.html

Use STUDIO_SHORT_NAME for Studio

2014-12-23 11:14:58 -05:00

settings_graders.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

settings.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

studio_xblock_wrapper.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

temp-course-landing.html

Replace "edX Studio" with "{studio_name}"

2014-12-19 13:58:42 -05:00

textbooks.html

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

videos_index.html

fixing styling and class syntax (to new FA-based classes) for missing UI elements

2015-01-09 12:01:26 -05:00