Victor Shnayder 6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge" ...

This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.

2013-02-08 15:00:25 -05:00

..

course_groups

Only show cohort config for cohorted courses

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

courseware

merge out from master

2013-02-07 17:40:54 -05:00

discussion

Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"

2013-02-08 15:00:25 -05:00

emails

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

instructor

Add in some better encouragement to write feedback

2013-02-01 15:15:42 -05:00

licenses

Added html view of serial numbers. Refactored code.

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

open_ended_problems

Address review comments

2013-02-04 17:15:07 -05:00

peer_grading

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

registration

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

simplewiki

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

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

static_templates

fix capitalization and spacing

2013-02-08 12:33:19 -05:00

university_profile

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

wiki

Added call to load schematics on wiki pages.

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

.gitignore

…

.hgignore

…

accounts_login.html

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

book_toc.xml

XML based table of contents for books.

2012-08-08 14:13:20 -04:00

combined_open_ended_results.html

Updates to the CSS and html formatting for statuses

2013-01-17 11:34:44 -05:00

combined_open_ended_status.html

Change step names to human names

2013-01-30 16:44:40 -05:00

combined_open_ended.html

Add in file upload ability

2013-01-29 22:16:48 -05:00

conditional_ajax.html

add coffeescript/js for conditional module, does XModule.loadModules

2013-02-03 18:53:51 -05:00

conditional_module.html

for require_attempted display "attempted" instead of "completed"

2013-02-04 19:54:36 -05:00

contact.html

…

course_filter.html

…

course.html

Add property to course module to check if a course is new

2013-01-10 15:57:29 -05:00

dashboard.html

Minor update to embargo text

2013-01-29 16:47:09 -05:00

dogfood.html

…

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

Added missing file

2012-08-22 16:15:24 -04:00

extauth_failure.html

add openid authentication

2012-08-01 14:59:55 -04:00

feed.rss

7.00x press release

2013-01-30 16:07:47 -05:00

feedback_email.txt

…

footer.html

Added one more year!

2013-01-25 13:31:23 -05:00

forgot_password_modal.html

…

gitupdate.html

…

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

OpenID provider implementation

2012-08-29 10:29:42 -04:00

index.html

Replace front page video

2013-01-17 10:47:50 -05:00

invalid_email_key.html

…

login_modal.html

optimize!

2012-09-24 09:22:35 -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

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

more template updates to rename MITx to edX

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

name_changes.html

First pass at branding the header logo on subdomains

2012-08-22 14:05:19 -04:00

navigation.html

revised no certificate state for dashboard messages and removed course message UI for future work on separate branch

2012-11-09 18:18:36 -05:00

open_ended_error.html

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

open_ended_evaluation.html

Remove html

2013-01-10 19:00:02 -05:00

open_ended_feedback.html

Add the ability to set up custom text for short form and

2013-01-22 13:17:37 -05:00

open_ended_rubric.html

Visual updates to rubric

2013-02-01 15:15:42 -05:00

open_ended.html

Make CSS nicer

2013-01-30 13:00:03 -05:00

press.json

add press mentions for October, update missing logos, and add sorting.

2012-11-19 10:28:40 -05: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

remove collapsible from problem template

2012-09-28 12:37:25 -04:00

provider_login.html

[#35491529] Small corrections to OpenID provider login page

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

quickedit.html

…

self_assessment_hint.html

Add in support for passing problem type to javascript

2013-01-10 18:59:59 -05:00

self_assessment_prompt.html

Make CSS nicer

2013-01-30 13:00:03 -05:00

self_assessment_rubric.html

Make the rubric for self-assessment selectable and remove the

2013-02-01 15:15:42 -05:00

seq_module.html

Make editing work, building towards drag/drop saving

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

show_circuit.html

…

signup_modal.html

Fix placeholder email in signup form

2013-02-05 22:24:20 -05:00

staff_problem_info.html

Whitespace cleanup

2013-01-23 14:37:42 -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

add UTC time to registration end date

2013-01-24 01:18:10 -05:00

tracking_log.html

fix view_tracking_log to show proper timezone

2012-08-17 15:46:09 -04:00

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

Hack to disable YouTube <iframe> API when they break it.

2013-02-06 22:37:41 -05:00

xrds.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00