Commits · a68cdd35d8bfe29f6af3a2a8a9c97eb6a41ab899 · edx / edx-platform · GitLab

08 Mar, 2013 40 commits
- Add advanced_modules course setting back in. · a68cdd35
  cahrens committed Mar 08, 2013
  
  a68cdd35 Browse Files
- Only display settings in the cms advanced settings page · e3f7e602
  Calen Pennington committed Mar 08, 2013
  
  e3f7e602 Browse Files
- Make annotable module use the new xmodule format · 248ce880
  Calen Pennington committed Mar 08, 2013
  
  248ce880 Browse Files
- Make display_name defaulting explicit · 93db5acc
  Calen Pennington committed Mar 08, 2013
  
  93db5acc Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · e4dea025
  Chris Dodge committed Mar 08, 2013
  
  e4dea025 Browse Files
- fix regression where wrap_xmodule_display got set to True for 'about' and 'info' · 5e3b084c
  Chris Dodge committed Mar 08, 2013
  
  5e3b084c Browse Files
- Only run setup_debug once the page has finished loading · 79ad2ecd
  Calen Pennington committed Mar 08, 2013
  
  79ad2ecd Browse Files
- Make allow_anonymous and allow_anonymous_to_peers use field access in templates · 1962d247
  Calen Pennington committed Mar 08, 2013
  
  1962d247 Browse Files
- Make remote_gradebook use the new field instead of metadata · d8b99e1e
  Calen Pennington committed Mar 08, 2013
  
  d8b99e1e Browse Files
- Return children from timelimit module definition_from_xml in the new format… · c1a8c6de
```
Return children from timelimit module definition_from_xml in the new format (separate from definition)
```
  Calen Pennington committed Mar 08, 2013
  c1a8c6de Browse Files
- Fix bad merge in discussion utils · 4fd1b936
  Calen Pennington committed Mar 08, 2013
  
  4fd1b936 Browse Files
- Use the correct format for specifying ruby version · 5e646959
  Calen Pennington committed Mar 08, 2013
  
  5e646959 Browse Files
- Update to ruby 1.9.3, which is what's installed on production servers · 0d4e2b63
  Calen Pennington committed Mar 08, 2013
  
  0d4e2b63 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 8ae33679
  Calen Pennington committed Mar 08, 2013
  
  8ae33679 Browse Files
- Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics · d9b68e2d
```
Add datadog metrics capture around heartbeat timing
```
  Calen Pennington committed Mar 08, 2013
  d9b68e2d Browse Files
- Use https to talk to rubygems · fab07597
  Calen Pennington committed Mar 08, 2013
  
  fab07597 Browse Files
- Merge pull request #1630 from MITx/fix/zoldak/lettuce-click · 849e8d6c
```
Fix lettuce tests to work with phantomJS
```
  Christina Roberts committed Mar 08, 2013
  849e8d6c Browse Files
- Fix test that sets release date to work on all platforms · 55eefd0e
  Jay Zoldak committed Mar 08, 2013
  
  55eefd0e Browse Files
- Fix intermittent lettuce test failure on ubuntu. · 24d08893
  Jay Zoldak committed Mar 08, 2013
  
  24d08893 Browse Files
- Change default browser for lettuce back to chrome. · 1f30baab
  Jay Zoldak committed Mar 08, 2013
  
  1f30baab Browse Files
- More robust handling for finding and clicking on objects by css. · 21e7bc51
```
Tag tests not working under PhantomJS to skip for now.
```
  Jay Zoldak committed Mar 08, 2013
  21e7bc51 Browse Files
- Fix signup test on ubuntu · b66d0cf5
  Jay Zoldak committed Mar 08, 2013
  
  b66d0cf5 Browse Files
- Update update_templates reference · ad5d2a96
  Jay Zoldak committed Mar 08, 2013
  
  ad5d2a96 Browse Files
- Catch WebDriverException · e84fa638
  Jay Zoldak committed Mar 08, 2013
  
  e84fa638 Browse Files
- Click in the upper left of an element instead of the middle. · 21c15d8f
  Jay Zoldak committed Mar 08, 2013
  
  21c15d8f Browse Files
- Catch WebDriverException · 3cec8f1a
  Jay Zoldak committed Mar 08, 2013
  
  3cec8f1a Browse Files
- Click in the upper left of an element instead of the middle. · b9e5ed95
  Jay Zoldak committed Mar 08, 2013
  
  b9e5ed95 Browse Files
- Set the dogapi version · ae610aeb
  Calen Pennington committed Mar 08, 2013
  
  ae610aeb Browse Files
- Add datadog metrics capture around heartbeat timing · cd802d8e
  Calen Pennington committed Mar 08, 2013
  
  cd802d8e Browse Files
- Merge pull request #1627 from MITx/fix/will/update_correctmap_npoints_test · e7bf05ea
```
Updated tests for correct_map to match changes made to get_npoints
```
  Jay Zoldak committed Mar 08, 2013
  e7bf05ea Browse Files
- Merge pull request #1626 from MITx/fix/cale/module-render-500-fix · ffec9c48
```
Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Produc...
```
  David Ormsbee committed Mar 08, 2013
  ffec9c48 Browse Files
- Fix… · a44c0932
```
Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user
```
  Calen Pennington committed Mar 08, 2013
  a44c0932 Browse Files
- Updated tests for correct_map to match changes made to get_npoints · 352126b4
  Will Daly committed Mar 08, 2013
  
  352126b4 Browse Files
- Set position just-in-time when rendering sequences for the first time · 972fed2e
  Calen Pennington committed Mar 08, 2013
  
  972fed2e Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 96541c43
  Victor Shnayder committed Mar 08, 2013
  
  96541c43 Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · b0790921
  Victor Shnayder committed Mar 08, 2013
  
  b0790921 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 84f05f9f
```
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
```
  Victor Shnayder committed Mar 08, 2013
  84f05f9f Browse Files
- Merge pull request #1625 from MITx/hotfix/dave/missing_npoints · 5644d081
```
Hotfix/dave/missing npoints
```
  Victor Shnayder committed Mar 07, 2013
  5644d081 Browse Files
- minor comment on partial credit · 5f44b2de
  David Ormsbee committed Mar 07, 2013
  
  5f44b2de Browse Files
- Quick patch to regression causing partial credit to break on 6.00x · 30f3923c
  David Ormsbee committed Mar 07, 2013
  
  30f3923c Browse Files