Greg Price 2c29481611 Merge pull request #106 from edx/release ...

Merge hotfix-2013-06-07

2013-06-07 08:05:58 -07:00

..

combinedopenended

Move self assessment templates

2013-03-01 13:45:55 -05:00

course_groups

Only show cohort config for cohorted courses

2013-01-24 15:14:34 -05:00

courseware

Fix XSS vulnerability in instructor dashboard

2013-06-07 10:23:03 -04:00

debug

A /debug/run_python endpoint for staff to test the sandboxing of Python code.

2013-05-06 11:39:17 -04:00

discussion

Handle Heroku's 503 maintenance mode response

2013-05-21 10:03:51 -07:00

emails

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00

instructor

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-19 15:21:09 -05:00

licenses

Added html view of serial numbers. Refactored code.

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

open_ended_problems

Add in support for getting and displaying ETA

2013-02-20 13:28:37 -05:00

peer_grading

Minor fixes

2013-04-16 11:55:54 -04:00

registration

Use bugs email from settings, not hardcoded value

2013-06-05 10:27:25 -07:00

simplewiki

…

static_templates

Theme static error pages

2013-06-05 10:27:24 -07:00

university_profile

update POST-back URL to the new one - post Drupal

2013-05-29 12:02:41 -04:00

widgets

Adds segment-io integration into the LMS

2013-06-06 11:34:03 -04:00

wiki

Added call to load schematics on wiki pages.

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

.gitignore

…

.hgignore

…

admin_dashboard.html

Cleaned up admin_dashboard code and template

2013-02-28 11:11:57 -05:00

annotatable.html

visually distinguish instructions from guided discussion section

2013-03-06 00:05:28 -05:00

book_toc.xml

…

conditional_ajax.html

poll and conditional finished

2013-02-15 18:48:39 +02:00

conditional_module.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

contact.html

…

course_filter.html

…

course.html

Add theming hooks to (old) landing page

2013-06-05 10:27:22 -07:00

dashboard.html

Use the contact email setting instead of if/else

2013-06-05 10:27:24 -07:00

edit_circuit.html

…

email_change_failed.html

Make email change templates use main layout

2013-06-05 10:27:25 -07:00

email_change_successful.html

Make email change templates use main layout

2013-06-05 10:27:25 -07:00

email_exists.html

Make email change templates use main layout

2013-06-05 10:27:25 -07:00

emails_change_successful.html

Make email change templates use main layout

2013-06-05 10:27:25 -07:00

enroll_students.html

…

extauth_failure.html

…

feed.rss

Press updates

2013-05-03 08:55:40 -04:00

feedback_email.txt

…

foldit.html

Allow progress without leaderboard and vice-versa

2013-02-25 17:28:22 -05:00

folditbasic.html

Format timestamp.

2013-04-01 14:18:15 -04:00

folditchallenge.html

Included styling and template

2013-02-25 18:18:46 -05:00

footer.html

Look for the existence of the links, not for

2013-05-16 16:30:29 -04:00

forgot_password_modal.html

Fix forgot password modal for theming

2013-06-05 10:27:23 -07:00

google_analytics.html

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

graphical_slider_tool.html

Removed unnecessary XML section. Documenting.

2013-01-15 12:55:13 +02:00

help_modal.html

Re-insert "if in course" check for displaying paragraph about forums.

2013-06-05 16:04:21 -04:00

homework.html

…

identity.xml

…

index.html

Add theming hooks to (old) landing page

2013-06-05 10:27:22 -07:00

invalid_email_key.html

Make email change templates use main layout

2013-06-05 10:27:25 -07:00

login_modal.html

moving preventDefault() statements to the local script tag

2013-05-07 12:50:59 -07:00

login.html

removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view

2013-06-06 14:48:40 -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

Adds segment-io integration into the LMS

2013-06-06 11:34:03 -04:00

mktg_iframe.html

Disable marketing registration button for courses that user cannot enroll in

2013-05-17 14:10:04 -04:00

module-error.html

more template updates to rename MITx to edX

2012-09-06 15:12:19 -04:00

name_changes.html

…

navigation.html

Inject theming hooks into navigation bar

2013-06-05 10:27:14 -07:00

notes.html

fix pep8 warnings and add empty message to notes tab

2013-05-13 16:54:32 -04:00

poll.html

poll and conditional finished

2013-02-15 18:48:39 +02:00

press.json

Press updates

2013-05-03 08:55:40 -04:00

problem_ajax.html

Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating).

2013-01-29 16:30:41 -05:00

problem.html

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

provider_login.html

[#35491529] Small corrections to OpenID provider login page

2012-09-04 20:53:51 -04:00

register.html

adds missed }

2013-06-06 14:48:41 -04:00

seq_module.html

fixing some more LMS accessibility issues

2013-05-07 10:25:16 -07:00

show_circuit.html

…

signup_modal.html

moving preventDefault() statements to the local script tag

2013-05-07 12:50:59 -07:00

staff_problem_info.html

GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info.

2013-06-07 16:12:50 +03:00

static_htmlbook.html

modified the html static book to only enable annotator.js when notes are enabled for the course

2013-05-06 19:29:44 -04:00

static_pdfbook.html

fix viewing of pdfbook on firefox

2013-02-27 17:09:50 -05: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

…

test_center_register.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

tracking_log.html

…

using.html

…

vert_module.html

Make drag/drop save content immediately in seqs and verticals

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

video_modal.html

…

video.html

Add passing Lettuce testing for video autoplay in LMS.

2013-05-31 11:22:45 -04:00

videoalpha.html

Revert changes to how video_alpha is stubbed out for testing.

2013-05-31 12:12:14 -04:00

word_cloud.html

refactoring after Python code review

2013-05-13 14:44:07 +03:00

xrds.xml

…