Rocky Duan 5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py

2012-08-14 17:32:30 -07:00

..

discussion

Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge

2012-08-14 17:32:30 -07: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

fix typo in registration button jquery

2012-08-07 10:09:55 -04:00

registration

Bad hardcoded hack fix to password reset.

2012-07-23 22:27:33 -04:00

simplewiki

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -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

.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

Make accordion remember state

2012-08-09 19:47:08 -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_navigation.html

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

2012-08-14 12:54:43 -07: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

courseware-error.html

Moved files and removed files

2012-07-30 17:37:53 -04:00

courseware.html

Make courseware navigation work again.

2012-08-10 14:51:47 -04:00

dashboard.html

added a cleaner arrow implementation

2012-08-13 10:19:06 -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

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

Removed copyright page, until it can be updated for edX.

2012-07-23 14:48: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

grade_summary.html

Add instructor dashboard

2012-08-10 11:42:53 -04:00

gradebook_profilegraphs.html

Moved files and removed files

2012-07-30 17:37:53 -04:00

gradebook.html

Remove extra braces that were causing mako syntax errors

2012-08-13 00:48:35 -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

info.html

Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class

2012-08-01 17:36:11 -04:00

instructor_dashboard.html

Remove extra braces that were causing mako syntax errors

2012-08-13 00:48:35 -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.html

courseware still not working..

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

module-error.html

Responding to comments on pull #326

2012-08-02 09:56:01 -04:00

name_changes.html

Moved files and removed files

2012-07-30 17:37:53 -04:00

navigation.html

add feature flag to disable login button (for systems which autologin)

2012-08-10 15:57:41 -04:00

news.html

merge with origin master

2012-08-01 14:24:46 -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

Make problem previews work by saving problem state in the current request session

2012-07-24 16:14:04 -04:00

profile_graphs.js

Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)

2012-08-06 18:51:11 -04:00

profile.html

Remove extra braces that were causing mako syntax errors

2012-08-13 00:48:35 -04:00

quickedit.html

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

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

seq_module.html

Standardize how JS XModules are instantiated

2012-07-24 16:14:04 -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

allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER']

2012-08-12 12:43:08 -04:00

staticbook.html

cleaned up textbook nav styles

2012-08-09 14:44:50 -04:00

tab_module.html

Moving LMS code into subdirectory

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

textbook.html

Moving LMS code into subdirectory

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

tracking_log.html

tracking_log template

2012-08-05 16:35:32 -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