Commits · d7484c5e10c8c109fb6b3a09dc13ee25cb0bc2cd · edx / edx-platform · GitLab

05 Mar, 2013 13 commits
- Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all · d7484c5e
```
removed un-enroll all button for fear of disaster
```
  Victor Shnayder committed Mar 05, 2013
  d7484c5e Browse Files
- Merge pull request #1599 from MITx/feature/deena/testing · a018b8ac
```
Feature/deena/testing
```
  Will Daly committed Mar 05, 2013
  a018b8ac Browse Files
- Pep8 fixes for tests · b0a01819
  Jay Zoldak committed Mar 05, 2013
  
  b0a01819 Browse Files
- Import existing UserFactory · cee24c5c
  Jay Zoldak committed Mar 05, 2013
  
  cee24c5c Browse Files
- Merge pull request #1600 from MITx/bug/christina/misc · 692c4236
```
Don't collapse multiple underscores for asset names.
```
  chrisndodge committed Mar 05, 2013
  692c4236 Browse Files
- Don't collapse multiple underscores for asset names. · cc234d45
```
#202
```
  cahrens committed Mar 05, 2013
  cc234d45 Browse Files
- Merge pull request #1595 from MITx/bug/christina/misc · 5b315844
```
Selenium tests to go with pull request 1577 (bug #216)
```
  Christina Roberts committed Mar 05, 2013
  5b315844 Browse Files
- Fixed whitespace issues; removed a test that made no assertions · 2fd9ccec
  Will Daly committed Mar 05, 2013
  
  2fd9ccec Browse Files
- Cleaned up some tests; deleted skip tests · 437aadb2
  Will Daly committed Mar 05, 2013
  
  437aadb2 Browse Files
- Updated Deena's tests after merge with master to ensure that none · faf5c3f0
```
of the tests fail.  Deleted some tests.
```
  Will Daly committed Mar 05, 2013
  faf5c3f0 Browse Files
- Merge branch 'master' into bug/christina/misc · d891361b
  cahrens committed Mar 05, 2013
  
  d891361b Browse Files
- Merge pull request #1592 from MITx/fix/cdodge/optimize-instructor-dashboard · 59250225
```
additional courseware view optimizations. Do a 'depth' fetch on the sele...
```
  chrisndodge committed Mar 04, 2013
  59250225 Browse Files
- add comment · 6ce3493f
  Chris Dodge committed Mar 04, 2013
  
  6ce3493f Browse Files
04 Mar, 2013 27 commits
- Merge pull request #1596 from MITx/jth/admindash · a58e7c7a
```
Cast cursor responses as lists.  MySQL returns them as tuples.
```
  Victor Shnayder committed Mar 04, 2013
  a58e7c7a Browse Files
- Cast cursor responses as lists. MySQL returns them as tuples. · 94db91fc
```
Removed print statemetns
Moved import call to top of file
```
  John Hess committed Mar 04, 2013
  94db91fc Browse Files
- make branch · b0106a41
  cahrens committed Mar 04, 2013
  
  b0106a41 Browse Files
- Merge branch 'master' into feature/deena/testing · 2436d59e
```
Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py
```
  Will Daly committed Mar 04, 2013
  2436d59e Browse Files
- Merge pull request #1594 from MITx/bug/dhm/course_update_js · 22420adc
```
Provide convenience converter of the grading policy but don't save it on
```
  Jay Zoldak committed Mar 04, 2013
  22420adc Browse Files
- Provide convenience converter of the grading policy but don't save it on · 0c4a5256
```
the object.
```
  Don Mitchell committed Mar 04, 2013
  0c4a5256 Browse Files
- Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util · ecb136e5
```
move call to update_templates on service startup into a django-admin com...
```
  Don Mitchell committed Mar 04, 2013
  ecb136e5 Browse Files
- 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
- additional courseware view optimizations. Do a 'depth' fetch on the selected… · a81e9a67
```
additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again
```
  Chris Dodge committed Mar 04, 2013
  a81e9a67 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