Chris Dodge 27d7c19c40 Merge branch 'release' ...

Conflicts:
	cms/templates/widgets/source-edit.html

2014-04-14 14:17:03 -04:00

..

dev

Create urls/views/templates for dev-only views

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

emails

i18n: Fix typo in studio's email

2014-03-25 16:51:24 +08:00

js

Implement next round of code reviews

2014-04-09 12:15:38 -04:00

registration

Miscellaneous fixes to strings found during i18n work.

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

ux/reference

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

widgets

Merge branch 'release'

2014-04-14 14:17:03 -04:00

404.html

remove instances of @edx.org email addresses in our default settings

2013-10-24 17:02:15 -04:00

500.html

remove instances of @edx.org email addresses in our default settings

2013-10-24 17:02:15 -04:00

activation_active.html

Use format for strings instead of %.

2013-07-25 12:21:17 -04:00

activation_complete.html

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

activation_invalid.html

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

asset_index.html

Add a loading indicator to the Files & Uploads page.

2014-03-24 10:51:36 -04:00

base.html

Tiny MCE version 4.0.20

2014-04-02 11:12:26 -04:00

checklists.html

Studio: Review all panel help copy

2013-11-19 10:35:17 -05:00

component.html

removed edit-dialog and uploads css, changed component edit icon to pencil, small css fixes

2014-04-09 10:32:11 -04:00

container_xblock_component.html

Use display_name_with_default instead of display_name.

2014-03-05 12:01:24 -05:00

container.html

fix for fuzzy prompt on container page

2014-04-10 21:22:20 -04:00

course_info.html

Test for i4x on returned pages.

2013-11-20 12:48:24 -05:00

edit_subsection.html

Move date_utils to common/djangoapps/util

2014-02-18 17:35:56 -05:00

edit-tabs.html

fix for fuzzy prompt on Studio Pages

2014-04-11 13:06:22 -04:00

error.html

Studio i18n

2013-07-12 16:25:39 -04:00

export_git.html

Major refactor and rename of feature

2014-02-13 12:53:47 -05:00

export.html

Changes for viewing built-in tabs in studio

2014-03-21 13:58:01 -04:00

howitworks.html

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

html_error.html

fixing alignment error on studio component error message, i18n error message

2013-10-15 16:16:09 -04:00

import.html

Message changed for course import when timeout.

2014-04-09 11:54:06 +05:00

index.html

Enable/disable unicodes in course id's

2014-03-17 20:24:59 +05:00

login.html

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

manage_users.html

Cleaned up modules to reflect centralizing auth

2014-01-14 17:04:44 -05:00

overview.html

addressing review feedback

2014-04-09 16:45:22 -04:00

register.html

Switched from symlink to rename of template

2014-02-03 14:12:30 -05:00

settings_advanced.html

Updated help on Advanced Settings page

2014-01-15 14:21:59 -05:00

settings_graders.html

Restful api for course advanced settings

2013-11-26 10:17:52 -05:00

settings.html

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00

studio_vertical_wrapper.html

Use display_name_with_default instead of display_name.

2014-03-05 12:01:24 -05:00

studio_xblock_wrapper.html

Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag).

2014-04-10 21:22:15 -04:00

temp-course-landing.html

added edge logo; added edge temp landing page

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

textbooks.html

Rebuild the way modals are constructed to support nesting.

2014-04-09 10:32:13 -04:00

unit.html

Implement next round of code reviews

2014-04-09 12:15:38 -04:00