Don Mitchell f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into ...

feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html

2012-11-20 11:55:19 -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-19 10:38:58 -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

moved component editor to top; polished editor styles

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

course_index.html

First stab at an import page. Needs styling

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

course_info.html

Everything tested and ready for Tom to fix

2012-11-19 10:38:58 -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

fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model

2012-11-08 09:55:52 -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

Remove section close tag that had no open tag.

2012-11-09 11:40:23 -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

wrapped up section date setting; need help with already published sections

2012-10-22 16:43:44 -04:00

settings.html

Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into

2012-11-20 11:55:19 -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

Make all edits on unit page happen immediately, and restore the delete draft button

2012-10-24 15:00:33 -04:00