Commits · be369938aea772a2f41dbaa2a19209618ecee013 · edx / edx-platform · GitLab

19 Jul, 2012 17 commits
- Merge branch 'master' of github.com:MITx/mitx · be369938
  Rocky Duan committed Jul 19, 2012
  
  be369938 Browse Files
- add discussion app & url conf · 2b89a82a
  Rocky Duan committed Jul 19, 2012
  
  2b89a82a Browse Files
- Merge pull request #226 from MITx/arjun/choiceresponse · 703c7a95
```
Arjun/choiceresponse
```
  ichuang committed Jul 19, 2012
  703c7a95 Browse Files
- Replacing startouttext/endouttext with text in examples. · 25b6db76
  Arjun Singh committed Jul 19, 2012
  
  25b6db76 Browse Files
- Added tests for ChoiceResponses. · c87f9cd5
  Arjun Singh committed Jul 19, 2012
  
  c87f9cd5 Browse Files
- Adding information and an example for ChoiceResponse · 68713260
  Arjun Singh committed Jul 19, 2012
  
  68713260 Browse Files
- display simple threaded comment · 6f74c957
  Rocky Duan committed Jul 19, 2012
  
  6f74c957 Browse Files
- Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in. · 85f5c93d
  Arjun Singh committed Jul 19, 2012
  
  85f5c93d Browse Files
- Merged two multiple-choice-like response types into a single response; created… · a23c51e3
```
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.
```
  Arjun Singh committed Jul 19, 2012
  a23c51e3 Browse Files
- Allowing for form fields to submit more than one value; e.g. checkbox inputs. · ab11a5f7
  Arjun Singh committed Jul 19, 2012
  
  ab11a5f7 Browse Files
- Merge pull request #224 from MITx/fix_optioninput · 77dfc2ad
```
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
```
  ichuang committed Jul 19, 2012
  77dfc2ad Browse Files
- Merge pull request #221 from MITx/kimth/lms-coderesponse · b814e6a0
```
CodeResponse restricted to only one answer field
```
  ichuang committed Jul 19, 2012
  b814e6a0 Browse Files
- fix for py2.6 compatbility · 6ce2ab60
  ichuang committed Jul 19, 2012
  
  6ce2ab60 Browse Files
- fix optioninput to preserve author's ordering of options · 0903ba9c
  ichuang committed Jul 19, 2012
  
  0903ba9c Browse Files
- Further simplification after restricting to one answer field · ff4716ef
  kimth committed Jul 19, 2012
  
  ff4716ef Browse Files
- CodeResponse restricted to only one answer field · bff86c32
  kimth committed Jul 19, 2012
  
  bff86c32 Browse Files
- Merge pull request #185 from MITx/kimth/lms-coderesponse · 49ee1296
```
Kimth/lms coderesponse
```
  Calen Pennington committed Jul 19, 2012
  49ee1296 Browse Files
18 Jul, 2012 6 commits
- queuekey generated from LoncapaProblem seed + system time · cc9f9a9d
  kimth committed Jul 18, 2012
  
  cc9f9a9d Browse Files
- initial setup for the discussion module · f7c51870
  Rocky Duan committed Jul 18, 2012
  
  f7c51870 Browse Files
- Implemented 'initial_display' for CodeResponse · 84eb3efa
  kimth committed Jul 18, 2012
  
  84eb3efa Browse Files
- Further tests of CorrectMap in CodeResponse unit testing · bb0601ff
  kimth committed Jul 18, 2012
  
  bb0601ff Browse Files
- Merge pull request #198 from dementrock/master · 2eaa6dbc
```
fixed the bug that you can enroll a course several times
```
  ichuang committed Jul 17, 2012
  2eaa6dbc Browse Files
- only enroll a given course once · 7c480dd5
  Rocky Duan committed Jul 17, 2012
  
  7c480dd5 Browse Files
17 Jul, 2012 17 commits
- Deep copy of CorrectMap was implied by code. Made it actually the case · 1ddc3b56
  kimth committed Jul 17, 2012
  
  1ddc3b56 Browse Files
- Unit tests for CodeResponse update_score · 15b42b68
  kimth committed Jul 17, 2012
  
  15b42b68 Browse Files
- Merge pull request #195 from dementrock/master · b0328b24
```
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. 
```
  pmitros committed Jul 17, 2012
  b0328b24 Browse Files
- hello · aded6a4f
  sidhanth rao committed Jul 17, 2012
  
  aded6a4f Browse Files
- Queue callback consumes queuekey · 631517cc
  kimth committed Jul 17, 2012
  
  631517cc Browse Files
- fix potential <script> tag escape bug · ef2a8467
  Rocky Duan committed Jul 17, 2012
  
  ef2a8467 Browse Files
- Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem · 0b538fda
  kimth committed Jul 17, 2012
  
  0b538fda Browse Files
- Drop immediate seed prior to queuekey generation · d9432a15
  kimth committed Jul 17, 2012
  
  d9432a15 Browse Files
- adds one image to about page · ba6346cb
  Galen Frechette committed Jul 17, 2012
  
  ba6346cb Browse Files
- Moved imports to top of file · 8c327eb0
  kimth committed Jul 17, 2012
  
  8c327eb0 Browse Files
- Log both grading and queueing · 9b0e00ef
  kimth committed Jul 17, 2012
  
  9b0e00ef Browse Files
- improves course about page header, adds blog post images, works on static page layouts · e6589545
  Galen Frechette committed Jul 17, 2012
  
  e6589545 Browse Files
- updates copy on about contact and faq, tweeks home page header · c5ce0bdf
  Galen Frechette committed Jul 17, 2012
  
  c5ce0bdf Browse Files
- updates and imporves design of the home page header · d55cd78c
  Galen Frechette committed Jul 17, 2012
  
  d55cd78c Browse Files
- Merge pull request #179 from MITx/course_start · 04b8dbe0
```
Course start
```
  bridger committed Jul 17, 2012
  04b8dbe0 Browse Files
- Merge remote-tracking branch 'origin/master' into course_start · 2f4cf23b
```
Conflicts:
	common/djangoapps/student/views.py
```
  Bridger Maxwell committed Jul 17, 2012
  2f4cf23b Browse Files
- Merge pull request #184 from MITx/template_caching · 08ddd03b
```
edX caching
```
  bridger committed Jul 17, 2012
  08ddd03b Browse Files