Commits · d0eefc6a67e6f666c8de9cfb0fdf5e31d725a8f9 · edx / edx-platform · GitLab

04 Mar, 2013 21 commits
- Merge pull request #1580 from MITx/bug/dhm/course_update_js · d0eefc6a
```
Fix for script tags w/in json objects being oddly evaluated on html page
```
  Christina Roberts committed Mar 04, 2013
  d0eefc6a Browse Files
- Move side effecting of definition for grader to the course_module and · 020e1e94
```
don't make caller responsible.
```
  Don Mitchell committed Mar 04, 2013
  020e1e94 Browse Files
- Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug · df5ad6ba
```
Fix/will/cs191 matrix style bug
```
  Victor Shnayder committed Mar 04, 2013
  df5ad6ba Browse Files
- Merge pull request #1593 from MITx/hack/dave/submission_history · 42a944bb
```
It's not UTC time, it's whatever the local settings are set to 
```
  David Ormsbee committed Mar 04, 2013
  42a944bb Browse Files
- It's not UTC time, it's whatever the local settings are set to (New York in prod) · 01a1bf6b
  David Ormsbee committed Mar 04, 2013
  
  01a1bf6b Browse Files
- Merge pull request #1555 from MITx/feature/jkarni/foldit-api · 9d2a2cbc
```
Feature/jkarni/foldit api
```
  David Ormsbee committed Mar 04, 2013
  9d2a2cbc Browse Files
- Merge pull request #1516 from MITx/hack/dave/submission_history · b0afbba5
```
Record and report submission history for a problem
```
  David Ormsbee committed Mar 04, 2013
  b0afbba5 Browse Files
- Merge pull request #1588 from MITx/bugfix/dave/username_space_msg · c0bb4ee2
```
Tell user that spaces aren't allowed in usernames (requested by Teppo).
```
  Victor Shnayder committed Mar 04, 2013
  c0bb4ee2 Browse Files
- Fixes in response to Victor's comments. · 88a30cb7
  David Ormsbee committed Mar 04, 2013
  
  88a30cb7 Browse Files
- Merge pull request #1591 from MITx/fix/cdodge/optimize-instructor-dashboard · f33c0024
```
add performance optimizations (efficiently get all course content) to instructor dashboard
```
  David Ormsbee committed Mar 04, 2013
  f33c0024 Browse Files
- Don't prepopulate models which may have script tags in their payloads · de3a75d2
```
but fetch async via json get.
```
  Don Mitchell committed Mar 04, 2013
  de3a75d2 Browse Files
- Merge pull request #1590 from MITx/fix/cdodge/optimize-progress-summary-page · e4f1dab4
```
add depth parameters when loading course and student-state caches. This ...
```
  David Ormsbee committed Mar 04, 2013
  e4f1dab4 Browse Files
- add performance optimizations (efficiently get all course content) · b482e2ac
  Chris Dodge committed Mar 04, 2013
  
  b482e2ac Browse Files
- Separate bug on virgin grading policy edits not being persisted b/c the · 4245816e
```
definition not being updated when using defaults. Not sure why this
passed before.
```
  Don Mitchell committed Mar 04, 2013
  4245816e Browse Files
- add depth parameters when loading course and student-state caches. This will… · 4892897c
```
add depth parameters when loading course and student-state caches. This will make fewer (but fatter) queries to the database
```
  Chris Dodge committed Mar 04, 2013
  4892897c Browse Files
- Tell user that spaces aren't allowed in usernames (requested by Teppo). · a00f11c1
  David Ormsbee committed Mar 04, 2013
  
  a00f11c1 Browse Files
- Merge pull request #1583 from MITx/fix/ned/clean-ups · 9b1ae9f9
```
Fix/ned/clean ups
```
  Carlos Andrés Rocha committed Mar 04, 2013
  9b1ae9f9 Browse Files
- Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3 · 3a748b1e
```
Feature/kevin/cohorts take 3
```
  David Ormsbee committed Mar 04, 2013
  3a748b1e Browse Files
- proper tab · a9804a33
  Your Name committed Mar 04, 2013
  
  a9804a33 Browse Files
- Use 'is None' and 'is not None' · 7c8a9022
  Ned Batchelder committed Mar 04, 2013
  
  7c8a9022 Browse Files
- Fix some 2-space indents · 97f1e042
  Ned Batchelder committed Mar 04, 2013
  
  97f1e042 Browse Files
03 Mar, 2013 6 commits
- Merge pull request #1585 from MITx/fix/cdodge/fix-broken-test · 999ed17e
```
need to pass commit parameter
```
  chrisndodge committed Mar 02, 2013
  999ed17e Browse Files
- need to pass commit parameter · 3f9bc86c
  Chris Dodge committed Mar 02, 2013
  
  3f9bc86c Browse Files
- Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance · f543ad49
```
do the metadata comparison on the parent not the course as we don't actu...
```
  chrisndodge committed Mar 02, 2013
  f543ad49 Browse Files
- better fix · 949c95ea
  Kevin Chugh committed Mar 02, 2013
  
  949c95ea Browse Files
- fix · 32e0c580
  Your Name committed Mar 02, 2013
  
  32e0c580 Browse Files
- do the metadata comparison on the parent not the course as we don't actually… · bcea53d4
```
do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary).
```
  Chris Dodge committed Mar 02, 2013
  bcea53d4 Browse Files
02 Mar, 2013 1 commit
- Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 · 310ecead
```
Feature/kevin/cohorts take 3
```
  Victor Shnayder committed Mar 01, 2013
  310ecead Browse Files
01 Mar, 2013 12 commits
- Changed response_msg argument default to '' · 548f9b85
  Will Daly committed Mar 01, 2013
  
  548f9b85 Browse Files
- clean up commments · e1ef6a83
  Your Name committed Mar 01, 2013
  
  e1ef6a83 Browse Files
- Fixed a bug in CorrectMaps.get_npoints(), which would return 1 · 28a502ea
```
when npoints=0.
```
  Will Daly committed Mar 01, 2013
  28a502ea Browse Files
- new cohorts tested · b7a6eadc
  Your Name committed Mar 01, 2013
  
  b7a6eadc Browse Files
- Merge pull request #1550 from MITx/feature/cdodge/add-test-delete · c236b2c8
```
add another command line argument to allow users to only simulate a dele...
```
  chrisndodge committed Mar 01, 2013
  c236b2c8 Browse Files
- Merge pull request #1578 from MITx/bug/christina/misc · afc2d66d
```
Don't usurp ValidatingView's error handling.
```
  Don Mitchell committed Mar 01, 2013
  afc2d66d Browse Files
- Fix for script tags w/in json objects being oddly evaluated on html page · e55bb845
```
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
```
  Don Mitchell committed Mar 01, 2013
  e55bb845 Browse Files
- Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base · bba96ee1
```
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
```
  David Ormsbee committed Mar 01, 2013
  bba96ee1 Browse Files
- update usage feedback · 20540fbc
  Chris Dodge committed Mar 01, 2013
  
  20540fbc Browse Files
- Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice · 88bfdd01
```
Feature/will/move correct mark for multiple choice
```
  Victor Shnayder committed Mar 01, 2013
  88bfdd01 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete · 00472956
  Chris Dodge committed Mar 01, 2013
  
  00472956 Browse Files
- Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms · 7fa77769
```
turn on tracking in CMS / Studio
```
  chrisndodge committed Mar 01, 2013
  7fa77769 Browse Files