Brian Talbot
f2a495bfeb
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-08 12:23:10 -05:00
Brian Talbot
6418d033dd
studio - adding files I forgot to add when cleaning up Sass and originally committing
2013-03-08 12:20:40 -05:00
Calen Pennington
d9b68e2de2
Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics
...
Add datadog metrics capture around heartbeat timing
2013-03-08 08:59:44 -08:00
Calen Pennington
fab07597d2
Use https to talk to rubygems
2013-03-08 11:59:02 -05:00
Brian Talbot
928ecb98fc
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-08 11:47:51 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -05:00
Christina Roberts
849e8d6cdc
Merge pull request #1630 from MITx/fix/zoldak/lettuce-click
...
Fix lettuce tests to work with phantomJS
2013-03-08 08:23:01 -08:00
Jay Zoldak
55eefd0ef6
Fix test that sets release date to work on all platforms
2013-03-08 11:15:15 -05:00
Jay Zoldak
24d088933e
Fix intermittent lettuce test failure on ubuntu.
2013-03-08 11:15:15 -05:00
Jay Zoldak
1f30baabfd
Change default browser for lettuce back to chrome.
2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128
More robust handling for finding and clicking on objects by css.
...
Tag tests not working under PhantomJS to skip for now.
2013-03-08 11:15:14 -05:00
Jay Zoldak
b66d0cf5da
Fix signup test on ubuntu
2013-03-08 11:15:14 -05:00
Jay Zoldak
ad5d2a9624
Update update_templates reference
2013-03-08 11:15:14 -05:00
Jay Zoldak
e84fa63826
Catch WebDriverException
2013-03-08 11:15:14 -05:00
Jay Zoldak
21c15d8f1f
Click in the upper left of an element instead of the middle.
2013-03-08 11:15:14 -05:00
Jay Zoldak
3cec8f1a76
Catch WebDriverException
2013-03-08 11:15:14 -05:00
Jay Zoldak
b9e5ed9525
Click in the upper left of an element instead of the middle.
2013-03-08 11:15:14 -05:00
Calen Pennington
ae610aebaa
Set the dogapi version
2013-03-08 10:48:55 -05:00
Calen Pennington
cd802d8e14
Add datadog metrics capture around heartbeat timing
2013-03-08 10:36:59 -05:00
Jay Zoldak
e7bf05ea54
Merge pull request #1627 from MITx/fix/will/update_correctmap_npoints_test
...
Updated tests for correct_map to match changes made to get_npoints
2013-03-08 07:29:34 -08:00
David Ormsbee
ffec9c4866
Merge pull request #1626 from MITx/fix/cale/module-render-500-fix
...
Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Produc...
2013-03-08 07:09:48 -08:00
Calen Pennington
a44c0932d2
Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user
2013-03-08 10:08:39 -05:00
Will Daly
352126b417
Updated tests for correct_map to match changes made to get_npoints
2013-03-08 10:08:20 -05:00
Victor Shnayder
5644d08172
Merge pull request #1625 from MITx/hotfix/dave/missing_npoints
...
Hotfix/dave/missing npoints
2013-03-07 20:54:19 -08:00
David Ormsbee
5f44b2de04
minor comment on partial credit
2013-03-07 23:52:01 -05:00
David Ormsbee
30f3923c15
Quick patch to regression causing partial credit to break on 6.00x
2013-03-07 23:50:09 -05:00
Victor Shnayder
c18461342e
Merge pull request #1624 from MITx/diana/fix-problem-javascript
...
Fix issue where javascript was disappearing from problem html
2013-03-07 16:41:11 -08:00
Diana Huang
2c6ee50ac3
Fix issue where javascript was disappearing from problem html
2013-03-07 19:39:43 -05:00
Victor Shnayder
b02ff247cb
Merge pull request #1623 from MITx/fix/will/checkbox_bug
...
Fixed checkbox bug in capa_module
2013-03-07 14:05:52 -08:00
Will Daly
6a54c2a2bc
Fixed checkbox bug in capa_module
2013-03-07 17:01:56 -05:00
Christina Roberts
af058c2cb2
Merge pull request #1622 from MITx/fix/cdodge/static-url-allow-references-to-common
...
add comments
2013-03-07 13:19:23 -08:00
Chris Dodge
c23c5cc3d9
add comments
2013-03-07 16:12:21 -05:00
Christina Roberts
cb70a0f9d9
Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common
...
need to support link references to static content that is in the code ba...
2013-03-07 13:07:16 -08:00
Christina Roberts
85d5264f5b
Merge pull request #1616 from MITx/fix/will/mc_checkbox_bug
...
Fix/will/mc checkbox bug
2013-03-07 12:47:16 -08:00
Chris Dodge
891bddcdf9
need to support link references to static content that is in the code base (e.g. module's .js/.css)
2013-03-07 14:28:09 -05:00
Don Mitchell
49db56ab7d
Merge pull request #1618 from MITx/bug/christina/misc
...
New version of Backbone has separate invalid event.
2013-03-07 11:02:52 -08:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Will Daly
e86ed0db91
Merge branch 'master' into fix/will/mc_checkbox_bug
2013-03-07 12:07:34 -05:00
chrisndodge
19eb6a3449
Merge pull request #1617 from MITx/bug/christina/misc
...
Disable Django toolbar-- breaking mongo updates.
2013-03-07 08:31:44 -08:00
cahrens
4434ca632e
Disable Django toolbar-- breaking mongo updates.
2013-03-07 11:30:00 -05:00
Will Daly
8d83d2fb4e
Added handling of condition when no multiple choice item selected,
...
but the answer is incorrect.
2013-03-07 10:52:19 -05:00
Don Mitchell
2e23a5f584
Merge pull request #1615 from MITx/fix/cdodge/error-importing-metadata-with-empty-strings
...
make export a bit more resilient. If there's a piece of metadata that we...
2013-03-07 07:51:17 -08:00
Chris Dodge
9ba759802c
make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue.
2013-03-07 10:43:36 -05:00
Will Daly
e841f29352
Updated CSS and template for choicegroup response
...
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.
Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
2013-03-07 10:17:03 -05:00
Jay Zoldak
1b7863e79e
Merge pull request #1603 from MITx/fix/will/merge_jnater_unittests
...
Fix/will/merge jnater unittests
2013-03-07 06:47:55 -08:00
Victor Shnayder
5ec39825e0
Merge pull request #1604 from MITx/hotfix/jkarni/folditscore
...
Hotfix/jkarni/folditscore
2013-03-06 17:32:29 -08:00
Victor Shnayder
6af857b3fe
Merge pull request #1613 from MITx/victor/fix-blank-capa
...
Fix max_attempts=''
2013-03-06 17:18:38 -08:00
Victor Shnayder
b6a6e10bb5
Fix max_attempts=''
...
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
2013-03-06 20:16:24 -05:00
John Hess
28e300c033
Merge pull request #1612 from MITx/victor/fix-genex-css
...
remove links to missing image files. We can add them if needed later.
2013-03-06 16:14:09 -08:00
