edx-platform

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

Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3

2013-04-20 12:25:47 -04:00

discussion

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

emails

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04: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

edx.org - added basic styles to match previous password reset form to complete view

2013-04-09 15:38:10 -04:00

simplewiki

…

static_templates

Add accessibility text to the Contact page.

2013-04-29 16:55:29 -04:00

university_profile

Apply text and image changes reqeusted by UTAustinX

2013-04-04 13:52:33 -04:00

wiki

…

.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

Fix tests post-merge

2013-02-13 14:13:22 -05:00

dashboard.html

Create new marketing_link function to abstract link generation

2013-05-03 15:06:24 -04:00

edit_circuit.html

…

email_change_successful.html

Change email change success notice to say email instead of name

2012-10-18 12:20:52 -04:00

email_exists.html

…

emails_change_successful.html

…

enroll_students.html

…

extauth_failure.html

…

feed.rss

Merge pull request #1839 from MITx/feature/sef/pressreleases

2013-04-22 07:01:36 -07: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

Create new marketing_link function to abstract link generation

2013-05-03 15:06:24 -04:00

forgot_password_modal.html

drupal integration - revised copy, layout, and styles per marketing feedback

2013-01-23 18:22:13 -05: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

homework.html

…

identity.xml

…

index.html

Change TorontoX to University of TorontoX

2013-02-27 10:05:58 -05:00

invalid_email_key.html

…

login_modal.html

…

login.html

Create new marketing_link function to abstract link generation

2013-05-03 15:06:24 -04:00

main_django.html

…

main.html

Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.

2013-02-06 15:23:11 -05:00

module-error.html

…

name_changes.html

…

navigation.html

Create new marketing_link function to abstract link generation

2013-05-03 15:06:24 -04:00

poll.html

poll and conditional finished

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

press.json

Remove duplicate entries from the press page.

2013-04-05 11:10:08 -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

…

register.html

Create new marketing_link function to abstract link generation

2013-05-03 15:06:24 -04:00

seq_module.html

…

show_circuit.html

…

signup_modal.html

Fix typo in signup forms

2013-03-15 09:38:06 -07:00

staff_problem_info.html

make "edit" links work - fixes giturl (was broken by xblocks migration)

2013-04-07 00:03:36 +00:00

static_htmlbook.html

remove code for supporting anchor_id on html textbooks, since it doesn't work

2013-04-12 11:53:06 -04:00

static_pdfbook.html

fix viewing of pdfbook on firefox

2013-02-27 17:09:50 -05:00

staticbook.html

…

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

…

video_modal.html

…

video.html

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00

videoalpha.html

YouTube HTML5 mode is used by default. Fix typo in video alpha template.

2013-02-14 11:22:14 +02:00

xrds.xml

…