Commits · c5385ff42c77c184b4927f5b3c8859f3b56ed7bc · edx / edx-platform · GitLab

20 Mar, 2013 19 commits
- Update Berkeley logos · c5385ff4
```
LMS Lighthouse [#260]
```
  Carlos Andrés Rocha committed Mar 20, 2013
  c5385ff4 Browse Files
- Merge pull request #1706 from MITx/fix/cale/simple-lazy-object · f133d318
```
Force instantiation of the user before querying
```
  David Ormsbee committed Mar 20, 2013
  f133d318 Browse Files
- Merge pull request #1707 from MITx/victor/remove-dir-of-eng-job · c13fe997
```
Remove director of engineering job posting per request from Tess
```
  Diana Huang committed Mar 20, 2013
  c13fe997 Browse Files
- Remove director of engineering job posting per request from Tess · 83665515
  Victor Shnayder committed Mar 20, 2013
  
  83665515 Browse Files
- Only use .pk for queries, and not on inserts · 154a4410
  Calen Pennington committed Mar 20, 2013
  
  154a4410 Browse Files
- Fix pep8 and pylint errors · cbed6628
  Calen Pennington committed Mar 20, 2013
  
  cbed6628 Browse Files
- Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests · 84281198
```
Feature/will/coderesponse lettuce tests
```
  Jay Zoldak committed Mar 20, 2013
  84281198 Browse Files
- Force instantiation of the user before querying · 36443163
```
Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine

http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error
```
  Calen Pennington committed Mar 20, 2013
  36443163 Browse Files
- Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar · f7700dfc
```
Reduce pep8 warnings.
```
  chrisndodge committed Mar 20, 2013
  f7700dfc Browse Files
- Refactored lettuce test of capa problems to use · 5411fc76
```
world.css_click() helper instead of directly
calling splinter.
```
  Will Daly committed Mar 20, 2013
  5411fc76 Browse Files
- Merge pull request #1704 from MITx/fix/btalbot/studio-updatedelete · ba0b7948
```
studio - added in basic JS confirm UI when deleting course updates
```
  chrisndodge committed Mar 20, 2013
  ba0b7948 Browse Files
- studio - added in basic JS confirm UI when deleting course updates · f181a454
  Brian Talbot committed Mar 20, 2013
  
  f181a454 Browse Files
- Added __init__.py and test_mock_xqueue_server.py, · 28674761
```
which should have been included in the last commit
```
  Will Daly committed Mar 20, 2013
  28674761 Browse Files
- Cale said, 'we should delete prod-requirements.txt' · 3a774264
  Ned Batchelder committed Mar 20, 2013
  
  3a774264 Browse Files
- Moved mock_xqueue_server to its own subpackage within · 8f055ab0
```
lms/djangoapps/courseware/
Separated tests of the mock server into test_mock_xqueue_server.py
```
  Will Daly committed Mar 20, 2013
  8f055ab0 Browse Files
- Merge pull request #1677 from MITx/victor/fix-auto-cohorting · 2415680e
```
Fix randomness bug in cohort placement
```
  Diana Huang committed Mar 20, 2013
  2415680e Browse Files
- Merge pull request #1702 from MITx/victor/remove-legal-council-job · e0184453
```
Remove associate legal council posting, per request from Tess
```
  Diana Huang committed Mar 20, 2013
  e0184453 Browse Files
- Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue · 05ba082c
```
Bug fix for Polls tool.
```
  Alexander Kryklia committed Mar 20, 2013
  05ba082c Browse Files
- Remove associate legal council posting, per request from Tess · 21e58d00
  Victor Shnayder committed Mar 20, 2013
  
  21e58d00 Browse Files
19 Mar, 2013 14 commits
- Reduce pep8 warnings. · f5bae8d8
  cahrens committed Mar 19, 2013
  
  f5bae8d8 Browse Files
- Merge pull request #1698 from MITx/feature/christina/mongo-debug-toolbar · 8cbf24fd
```
Have to explicitly specify safe option on mongo insert, remove, update b...
```
  chrisndodge committed Mar 19, 2013
  8cbf24fd Browse Files
- Have to explicitly specify safe option on mongo insert, remove, update because… · b5a587d8
```
Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.
```
  cahrens committed Mar 19, 2013
  b5a587d8 Browse Files
- pep8 fixes · e7f8c7c6
  Will Daly committed Mar 19, 2013
  
  e7f8c7c6 Browse Files
- Removed file that was added accidentally. · 39aa25c2
  Will Daly committed Mar 19, 2013
  
  39aa25c2 Browse Files
- Moved XQueue mock from terrain into LMS, so that the · 66434d7d
```
server is not created for cms tests.
```
  Will Daly committed Mar 19, 2013
  66434d7d Browse Files
- Implemented CodeResponse lettuce tests · 20ccf593
  Will Daly committed Mar 19, 2013
  
  20ccf593 Browse Files
- Created MockXQueueServer which listens on a local port · 2087b815
```
and simulates an XQueue.
```
  Will Daly committed Mar 19, 2013
  2087b815 Browse Files
- Fixed bug where in firefox a marked poll button was not highlighted in blue. · 0884051b
  Valera Rozuvan committed Mar 19, 2013
  
  0884051b Browse Files
- Merge pull request #1687 from MITx/hotfix/edz/pinning · 39d451d9
```
Allow backwards compatibility for forums pinning UI.
```
  e0d committed Mar 19, 2013
  39d451d9 Browse Files
- Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance · a245cae4
```
Feature/cale/fix metadata inheritance
```
  chrisndodge committed Mar 19, 2013
  a245cae4 Browse Files
- Comment cleanup · 8fda5af4
  Calen Pennington committed Mar 19, 2013
  
  8fda5af4 Browse Files
- Remove trailing whitespace · 0209c883
  Calen Pennington committed Mar 19, 2013
  
  0209c883 Browse Files
- Always compute the metadata inheritance tree, even on a course module, so that… · 94d3ccf6
```
Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data
```
  Calen Pennington committed Mar 19, 2013
  94d3ccf6 Browse Files
18 Mar, 2013 7 commits
- Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests · a70a23a4
```
Feature/will/courseware lettuce tests
```
  Jay Zoldak committed Mar 18, 2013
  a70a23a4 Browse Files
- Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio · c50bf567
```
Fix/cdodge/add 500 404 templates to studio
```
  Don Mitchell committed Mar 18, 2013
  c50bf567 Browse Files
- remove import and shortened line length · 3e28ffa4
  Chris Dodge committed Mar 18, 2013
  
  3e28ffa4 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio · dc78a08c
  Chris Dodge committed Mar 18, 2013
  
  dc78a08c Browse Files
- Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite · 9a59336b
```
Fix version handling for combined open ended
```
  VikParuchuri committed Mar 18, 2013
  9a59336b Browse Files
- Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests · b6e82afb
```
Fix/will/fix broken jasmine lms tests
```
  Jay Zoldak committed Mar 18, 2013
  b6e82afb Browse Files
- Pep8 fixes · 568f557d
```
Changed constant to uppercase
```
  Will Daly committed Mar 18, 2013
  568f557d Browse Files