Commits · 8ae336792ad8b19094efcd33ede4f853ab1f2f82 · edx / edx-platform · GitLab

08 Mar, 2013 30 commits
- 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
- fix fat fingers? · 4c72dbfc
  Chris Dodge committed Mar 07, 2013
  
  4c72dbfc Browse Files
- Merge pull request #1624 from MITx/diana/fix-problem-javascript · c1846134
```
Fix issue where javascript was disappearing from problem html
```
  Victor Shnayder committed Mar 07, 2013
  c1846134 Browse Files
- Fix issue where javascript was disappearing from problem html · 2c6ee50a
  Diana Huang committed Mar 07, 2013
  
  2c6ee50a Browse Files
07 Mar, 2013 10 commits
- Merge pull request #1623 from MITx/fix/will/checkbox_bug · b02ff247
```
Fixed checkbox bug in capa_module
```
  Victor Shnayder committed Mar 07, 2013
  b02ff247 Browse Files
- Fixed checkbox bug in capa_module · 6a54c2a2
  Will Daly committed Mar 07, 2013
  
  6a54c2a2 Browse Files
- Merge pull request #1622 from MITx/fix/cdodge/static-url-allow-references-to-common · af058c2c
```
add comments
```
  Christina Roberts committed Mar 07, 2013
  af058c2c Browse Files
- add comments · c23c5cc3
  Chris Dodge committed Mar 07, 2013
  
  c23c5cc3 Browse Files
- Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common · cb70a0f9
```
need to support link references to static content that is in the code ba...
```
  Christina Roberts committed Mar 07, 2013
  cb70a0f9 Browse Files
- Merge pull request #1616 from MITx/fix/will/mc_checkbox_bug · 85d5264f
```
Fix/will/mc checkbox bug
```
  Christina Roberts committed Mar 07, 2013
  85d5264f Browse Files
- need to support link references to static content that is in the code base (e.g. module's .js/.css) · 891bddcd
  Chris Dodge committed Mar 07, 2013
  
  891bddcd Browse Files
- Merge pull request #1618 from MITx/bug/christina/misc · 49db56ab
```
New version of Backbone has separate invalid event.
```
  Don Mitchell committed Mar 07, 2013
  49db56ab Browse Files
- New version of Backbone has separate invalid event. · 98e41081
  cahrens committed Mar 07, 2013
  
  98e41081 Browse Files
- New version of Backbone has separate invalid event. · 9ec33928
  cahrens committed Mar 07, 2013
  
  9ec33928 Browse Files