Bridger Maxwell 14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki ...

Conflicts:
	lms/templates/wiki/settings.html

2012-08-22 13:09:42 -04:00

..

courseware

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

2012-08-22 11:41:19 -04:00

discussion

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

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

emails

…

jasmine

…

portal

…

registration

…

simplewiki

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

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

static_templates

…

university_profile

…

wiki

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

2012-08-22 13:09:42 -04:00

.gitignore

…

.hgignore

…

accordion.html

started courseware sidebar styling

2012-08-20 15:51:10 -04:00

book_toc.xml

…

contact.html

…

course_filter.html

…

course.html

…

courses.html

…

dashboard.html

Show policy, grading policy, and top-level errors

2012-08-21 15:00:21 -04:00

dogfood.html

…

edit_circuit.html

…

email_change_successful.html

…

email_exists.html

…

emails_change_successful.html

…

extauth_failure.html

…

feed.rss

…

feedback_email.txt

…

footer.html

…

forgot_password_modal.html

…

gitupdate.html

…

homework.html

…

index.html

…

invalid_email_key.html

…

login_modal.html

…

main_django.html

Added MathJax to wiki pages.

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

main.html

…

module-error.html

Catch errors in module load

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

name_changes.html

…

navigation.html

fixed anonymous header bug

2012-08-22 07:34:55 -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

…

press.json

…

problem_ajax.html

…

problem.html

Don't display 'None points' on problem rendering

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

quickedit.html

…

seq_module.html

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

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

show_circuit.html

…

signup_modal.html

…

staff_problem_info.html

…

staticbook.html

Merge pull request #464 from MITx/kimth/textbook

2012-08-20 12:38:14 -07:00

tab_module.html

…

textbook.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

…

video_modal.html

…

video.html

…