David Ormsbee aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes ...

Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache

2012-08-22 20:00:06 -04:00

..

courseware

Merge branch 'master' of github.com:MITx/mitx into merge

2012-08-22 15:51:08 -07:00

discussion

Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes

2012-08-22 20:00:06 -04:00

emails

Changing email messages to be edX, even the ones I don't think will be sent.

2012-07-18 18:43:48 -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

portal

Big access control refactor

2012-08-14 23:30:37 -04:00

registration

Bad hardcoded hack fix to password reset.

2012-07-23 22:27:33 -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 updated jobs descriptions for content related positions

2012-08-09 12:11:37 -04:00

university_profile

Merge pull request #248 from MITx/release_fixes

2012-07-20 15:10:33 -07:00

wiki

Delete page

2012-08-22 15:40:56 -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

started courseware sidebar styling

2012-08-20 15:51:10 -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

Let people know courses are free. <sigh>

2012-07-23 20:38:09 -04:00

dashboard.html

Show policy, grading policy, and top-level errors

2012-08-21 15:00:21 -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

Moving LMS code into subdirectory

2012-06-06 14:09:01 -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

Added small thumbnails for articles in the rss feed.

2012-07-23 17:06:22 -04:00

feedback_email.txt

Moving LMS code into subdirectory

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

footer.html

First pass at branding the header logo on subdomains

2012-08-22 14:05:19 -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

index.html

when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work

2012-08-13 18:09:14 -04:00

invalid_email_key.html

Moving LMS code into subdirectory

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

login_modal.html

Remove openid link when feature is disabled. https://www.pivotaltracker.com/story/show/34090805

2012-08-08 14:10:05 -04:00

main_django.html

Added MathJax to wiki pages.

2012-08-18 13:12:04 -04:00

main.html

courseware still not working..

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

module-error.html

Catch errors in module load

2012-08-22 12:58:46 -04:00

name_changes.html

First pass at branding the header logo on subdomains

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

navigation.html

Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH

2012-08-22 14:43:49 -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

New press articles

2012-07-25 18:09:26 -04:00

problem_ajax.html

Update code according to changes in 829e502

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

problem.html

Don't display 'None points' on problem rendering

2012-08-15 17:14:27 -04:00

quickedit.html

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

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

seq_module.html

Merge branch 'master' into feature/tomg/fall-design

2012-08-21 19:26:10 -04:00

show_circuit.html

Moving LMS code into subdirectory

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

signup_modal.html

remove unnecessary hidden fields

2012-08-02 13:44:37 -04:00

staff_problem_info.html

fix staff debug view, and also add new source_link

2012-08-22 15:51:08 -04:00

staticbook.html

Merge pull request #464 from MITx/kimth/textbook

2012-08-20 12:38:14 -07: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

Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js

2012-06-29 12:40:50 -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

Rename module.name and descriptor.name to url_name

2012-08-03 11:36:54 -04:00