Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into ...

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -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

Hopefully the course-info changes I had made w/o link destruction

2012-11-30 10:40:19 -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

Change the Embed column in assest index page to just display the URL

2012-11-14 13:35:54 -05:00

base.html

added and wired in SymbolSet font icon library assets

2012-11-16 09:23:33 -05:00

component.html

finished styling for static tabs; required some rework of global styles

2012-11-28 15:39:43 -05:00

course_index.html

First stab at an import page. Needs styling

2012-10-12 11:58:43 -04:00

course_info.html

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

2012-12-07 09:45:12 -05:00

edit_subsection.html

Remove vestigial save-subsection button

2012-10-24 15:18:03 -04:00

edit-static-page.html

properties changed to settings

2012-10-22 15:55:03 -04:00

edit-tabs.html

most of the styling and function changes made

2012-11-28 15:10:46 -05:00

editable_preview.html

First pass at integrating the new unit editing wireframes with the CMS

2012-10-01 15:17:40 -04:00

error.html

template for 404 and 500 errors

2012-10-11 09:58:35 -04:00

import.html

Fixing description of import format

2012-10-25 13:23:11 -04:00

index.html

key bindings and speed reworkings for the my courses and courseware pages

2012-11-29 16:21:51 -05:00

login.html

Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment

2012-10-25 10:47:41 -04:00

manage_users.html

moved error message into form area; tweaked cancel behavior

2012-10-30 11:39:08 -04:00

new_item.html

Hook up link to create modules from templates

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

overview.html

Merge pull request #1089 from MITx/feature/studio/tom/speedups

2012-11-30 08:55:31 -08:00

settings.html

Remove not yet wired tabs

2012-12-10 18:57:48 -05:00

signup.html

more prominent log in link on sign up form

2012-10-17 12:51:48 -04: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

most of the styling and function changes made

2012-11-28 15:10:46 -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