Rocky Duan
fdab215eb4
moved django_comment_client into edx
2012-07-23 16:20:45 -04:00
Rocky Duan
616eaf2500
integrated search; refactored some frontend code
2012-07-23 15:41:09 -04:00
Rocky Duan
784bd26510
forum view for discussions
2012-07-22 19:05:32 -04:00
Rocky Duan
639641a167
Merge branch 'master' of github.com:MITx/mitx
2012-07-20 13:27:38 -04:00
Rocky Duan
9189fae31e
create new post
2012-07-20 13:27:18 -04:00
Rocky Duan
3d43ba81ce
some basic functionalities of discussion
2012-07-20 12:19:20 -04:00
Calen Pennington
43cd2c2190
Merge pull request #216 from MITx/victor/fix_dev_script
...
Update dev script repos
2012-07-20 07:16:04 -07:00
Rocky Duan
be369938ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-19 17:08:46 -04:00
Rocky Duan
2b89a82ac2
add discussion app & url conf
2012-07-19 17:08:29 -04:00
ichuang
703c7a95a8
Merge pull request #226 from MITx/arjun/choiceresponse
...
Arjun/choiceresponse
2012-07-19 13:36:29 -07:00
Arjun Singh
25b6db762f
Replacing startouttext/endouttext with text in examples.
2012-07-19 13:24:19 -07:00
Victor Shnayder
42fa0806fe
Fix paths in create-dev-env.sh
...
* need to be in mitx/ to install common/lib/*
* create data dir if it doesn't exit
* add a few more log messages
* Change url for our fork of django-pipeline to stop the hanging checkouts.
It works either way on my machine, so not sure if this will fix it.
2012-07-19 16:13:56 -04:00
Arjun Singh
c87f9cd523
Added tests for ChoiceResponses.
2012-07-19 13:07:00 -07:00
Arjun Singh
6871326001
Adding information and an example for ChoiceResponse
2012-07-19 12:41:28 -07:00
Rocky Duan
6f74c9577d
display simple threaded comment
2012-07-19 14:46:08 -04:00
Arjun Singh
85f5c93d92
Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in.
2012-07-19 10:25:51 -07:00
Arjun Singh
a23c51e39c
Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses.
2012-07-19 10:25:51 -07:00
Arjun Singh
ab11a5f7ed
Allowing for form fields to submit more than one value; e.g. checkbox inputs.
2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7
Merge pull request #224 from MITx/fix_optioninput
...
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
2012-07-19 10:16:02 -07:00
ichuang
b814e6a08d
Merge pull request #221 from MITx/kimth/lms-coderesponse
...
CodeResponse restricted to only one answer field
2012-07-19 08:25:03 -07:00
ichuang
6ce2ab6025
fix for py2.6 compatbility
2012-07-19 11:19:42 -04:00
ichuang
0903ba9c1f
fix optioninput to preserve author's ordering of options
2012-07-19 11:15:14 -04:00
kimth
ff4716ef76
Further simplification after restricting to one answer field
2012-07-19 10:57:14 -04:00
kimth
bff86c32ca
CodeResponse restricted to only one answer field
2012-07-19 10:47:12 -04:00
Calen Pennington
49ee12963f
Merge pull request #185 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-19 06:29:48 -07:00
Victor Shnayder
c6ca8ab61f
Update dev script repos
...
* remove hg data repo
* pull the 6.002x repo
2012-07-18 18:51:28 -04:00
kimth
cc9f9a9df8
queuekey generated from LoncapaProblem seed + system time
2012-07-18 14:10:41 -04:00
Rocky Duan
f7c51870f3
initial setup for the discussion module
2012-07-18 12:00:42 -04:00
kimth
84eb3efa8a
Implemented 'initial_display' for CodeResponse
2012-07-18 11:08:17 -04:00
kimth
bb0601ff7a
Further tests of CorrectMap in CodeResponse unit testing
2012-07-18 08:54:54 -04:00
ichuang
2eaa6dbc25
Merge pull request #198 from dementrock/master
...
fixed the bug that you can enroll a course several times
2012-07-17 18:41:36 -07:00
Rocky Duan
7c480dd5b5
only enroll a given course once
2012-07-17 20:19:34 -04:00
kimth
1ddc3b560b
Deep copy of CorrectMap was implied by code. Made it actually the case
2012-07-17 18:33:56 -04:00
kimth
15b42b68eb
Unit tests for CodeResponse update_score
2012-07-17 18:20:03 -04:00
pmitros
b0328b245f
Merge pull request #195 from dementrock/master
...
Minor bug fix. Properly handles script tags where there are spaces before closing brace.
Code is also more elegant than original.
Note that this is not a security bug, as the fix indicated.
2012-07-17 14:49:34 -07:00
sidhanth rao
aded6a4fce
hello
2012-07-17 17:02:09 -04:00
kimth
631517ccdd
Queue callback consumes queuekey
2012-07-17 17:01:28 -04:00
Rocky Duan
ef2a8467e8
fix potential <script> tag escape bug
2012-07-17 17:00:36 -04:00
kimth
0b538fdac8
Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem
2012-07-17 16:58:55 -04:00
kimth
d9432a15ba
Drop immediate seed prior to queuekey generation
2012-07-17 15:26:40 -04:00
Galen Frechette
ba6346cb22
adds one image to about page
2012-07-17 14:54:35 -04:00
kimth
8c327eb07f
Moved imports to top of file
2012-07-17 14:44:20 -04:00
kimth
9b0e00efa2
Log both grading and queueing
2012-07-17 14:41:52 -04:00
Galen Frechette
e65895459a
improves course about page header, adds blog post images, works on static page layouts
2012-07-17 14:29:20 -04:00
Galen Frechette
c5ce0bdfea
updates copy on about contact and faq, tweeks home page header
2012-07-17 13:02:46 -04:00
Galen Frechette
d55cd78c73
updates and imporves design of the home page header
2012-07-17 12:56:29 -04:00
bridger
04b8dbe0d5
Merge pull request #179 from MITx/course_start
...
Course start
2012-07-17 09:54:17 -07:00
Bridger Maxwell
2f4cf23b73
Merge remote-tracking branch 'origin/master' into course_start
...
Conflicts:
common/djangoapps/student/views.py
2012-07-17 12:53:27 -04:00
bridger
08ddd03b5d
Merge pull request #184 from MITx/template_caching
...
edX caching
2012-07-17 09:49:21 -07:00
Bridger Maxwell
615f11e27b
Merge remote-tracking branch 'origin/master' into template_caching
2012-07-17 12:47:53 -04:00
