Bridger Maxwell 4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py

2012-08-06 16:49:05 -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

add comment about course start date logic

2012-08-06 14:23:55 -04:00

registration

Bad hardcoded hack fix to password reset.

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

simplewiki

Moved files and removed files

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

static_templates

Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3

2012-08-01 15:59:06 -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

Use url_name for chapters and sections in lms views

2012-08-02 14:28:44 -04:00

book_toc.html

Moving LMS code into subdirectory

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

add MITX_FEATURES flags to enable textbook and discussion,

2012-08-05 20:24:00 -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

courseware-error.html

Moved files and removed files

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

courseware.html

Prettier error display

2012-08-01 11:48:19 -04:00

dashboard.html

Merge branch 'hotfix/1.0.3'

2012-08-02 11:51:50 -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

gradebook_profilegraphs.html

Moved files and removed files

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

gradebook.html

Fixed some imports on gradebook.html

2012-08-06 11:32:26 -04:00

homework.html

Moving LMS code into subdirectory

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

index.html

fix javascript for signup modal .click() in index.html for safari

2012-08-02 13:52:25 -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

invalid_email_key.html

Moving LMS code into subdirectory

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

login_modal.html

add missing trailing slash

2012-08-01 20:19:33 -04:00

main.html

Added fix for videos start to zero out colors and mit styles

2012-07-31 14:18:42 -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

Point blog to http://edxonline.tumblr.com/

2012-07-19 13:34:38 -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

Moving LMS code into subdirectory

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

profile.html

Use url_name for chapters and sections in lms views

2012-08-02 14:28:44 -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

fix staff edit link in module content display (goes to github)

2012-08-04 17:52:14 -04:00

staticbook.html

Strip down sequence navigaiton and more stripping of the courseware nav

2012-08-01 17:36:10 -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