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

..

courseware

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

discussion

Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.

2012-11-01 04:37:16 -04:00

emails

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

licenses

Added html view of serial numbers. Refactored code.

2012-10-15 18:46:31 -04:00

portal

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

registration

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

simplewiki

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-20 16:10:17 -04:00

static_templates

Remove openings from job page

2012-11-05 10:23:58 -05:00

university_profile

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

wiki

Added call to load schematics on wiki pages.

2012-09-13 12:38:28 -04:00

.gitignore

…

.hgignore

…

accordion.html

Added widow fix for subtitles too

2012-09-12 16:35:21 -04:00

book_toc.xml

XML based table of contents for books.

2012-08-08 14:13:20 -04:00

contact.html

Fix grid and make sure that everything is fluid

2012-07-23 13:56:44 -04:00

course_filter.html

gets app completly uptodate with prototype

2012-06-20 14:37:37 -04:00

course.html

Remove lowercase edX in all caps

2012-07-20 11:11:47 -04:00

courses.html

revert inadvertent change to course.html

2012-09-04 19:47:37 -04:00

dashboard.html

Do not display the grade when student is not passing

2012-11-10 02:18:59 -05:00

dogfood.html

Passes course around for courseware. Fix static assets.

2012-07-03 12:13:15 -04:00

edit_circuit.html

…

email_change_successful.html

Change email change success notice to say email instead of name

2012-10-18 12:20:52 -04:00

email_exists.html

…

emails_change_successful.html

…

enroll_students.html

Added missing file

2012-08-22 16:15:24 -04:00

extauth_failure.html

add openid authentication

2012-08-01 14:59:55 -04:00

feed.rss

Make small corrections to UT pages and announcement

2012-10-15 11:54:23 -04:00

feedback_email.txt

…

footer.html

Blog link fix

2012-08-22 20:33:51 -04:00

forgot_password_modal.html

adds styles to password reset modal

2012-07-17 22:53:03 -04:00

gitupdate.html

…

google_analytics.html

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

homework.html

…

identity.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00

index.html

clean up commented-out links on main page

2012-11-14 12:01:04 -05:00

invalid_email_key.html

…

login_modal.html

optimize!

2012-09-24 09:22:35 -04:00

main_django.html

Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html.

2012-09-13 11:39:32 -04:00

main.html

add meta tag for google verification

2012-11-12 13:52:58 -08:00

module-error.html

more template updates to rename MITx to edX

2012-09-06 15:12:19 -04:00

name_changes.html

First pass at branding the header logo on subdomains

2012-08-22 14:05:19 -04:00

navigation.html

revised no certificate state for dashboard messages and removed course message UI for future work on separate branch

2012-11-09 18:18:36 -05:00

news.html

Fix some links taht were still pointing to the old courseware course_navigation pages.

2012-08-20 19:16:21 -04:00

notifications.html

fixed some notification stuff

2012-08-04 19:41:24 -04:00

press.json

add press mentions for October, update missing logos, and add sorting.

2012-11-19 10:28:40 -05:00

problem_ajax.html

Update code according to changes in 829e502

2012-07-03 14:33:24 -04:00

problem.html

remove collapsible from problem template

2012-09-28 12:37:25 -04:00

provider_login.html

[#35491529] Small corrections to OpenID provider login page

2012-09-04 20:53:51 -04:00

quickedit.html

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-10 13:39:19 -04:00

self_assessment_hint.html

more css tweaks

2012-11-12 13:17:26 -05:00

self_assessment_prompt.html

more css tweaks

2012-11-12 13:17:26 -05:00

self_assessment_rubric.html

Add in ability to define score points

2012-11-12 14:19:04 -05:00

seq_module.html

Make editing work, building towards drag/drop saving

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

show_circuit.html

…

signup_modal.html

Added back the ie fixes from before

2012-09-12 16:01:39 -04:00

staff_problem_info.html

Final ie8 fixes hopefully. Now renders correctly for staff. Moved the

2012-11-05 13:55:09 -05:00

staticbook.html

Display the last top level element in the Table of Contents as expandable.

2012-09-19 17:37:15 -04:00

stripped-main.html

transferred edge styles from cms to lms

2012-10-11 14:02:13 -04:00

tab_module.html

…

tracking_log.html

fix view_tracking_log to show proper timezone

2012-08-17 15:46:09 -04:00

using.html

…

vert_module.html

Make drag/drop save content immediately in seqs and verticals

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

video_modal.html

Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses.

2012-07-18 13:48:20 -04:00

video.html

wire through course asset path information to the video playback module and corresponding .coffee files

2012-11-26 11:19:51 -05:00

xrds.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00