Calen Pennington b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py

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

..

courseware

Added an indicator on Progress page when there are no problem scores in a section.

2012-10-10 14:53:39 -04:00

discussion

revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved

2012-10-12 04:22:27 -07:00

emails

Email wording changes based on Sarina's review

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

jasmine

Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory

2012-07-24 16:13:59 -04:00

licenses

Added html view of serial numbers. Refactored code.

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

portal

Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links

2012-09-13 10:22:44 -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

Add Cengage book press release

2012-10-18 14:45:42 -04:00

university_profile

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

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

wiki

Added call to load schematics on wiki pages.

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

.gitignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

Re-enable change name, and fix up change email styles

2012-10-12 14:31:20 -04:00

dogfood.html

Passes course around for courseware. Fix static assets.

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

edit_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

emails_change_successful.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

homework.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

identity.xml

OpenID provider implementation

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

index.html

Change order of X Universities in the front page

2012-10-16 13:02:13 -04:00

invalid_email_key.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

fix python syntax in template for adding google analytics

2012-10-05 11:49:17 -04: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

Pass course_id instead of course to get_site_status_msg

2012-10-08 14:06:58 -04: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

Added one last press release

2012-09-13 10:19:45 -04: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

seq_module.html

Make editing work, building towards drag/drop saving

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

show_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

signup_modal.html

Added back the ie fixes from before

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

staff_problem_info.html

add is_released

2012-09-02 19:04:55 -04: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

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

tracking_log.html

fix view_tracking_log to show proper timezone

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

using.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

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

Add support for video download link

2012-10-02 14:23:31 -04:00

xrds.xml

OpenID provider implementation

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