Calen Pennington
|
8bb0c64ff9
|
Set grading policy to an empty dict if it can't be decoded from json
|
2013-03-08 15:36:19 -05:00 |
|
Calen Pennington
|
e3f7e6024f
|
Only display settings in the cms advanced settings page
|
2013-03-08 15:22:49 -05:00 |
|
Calen Pennington
|
248ce8803b
|
Make annotable module use the new xmodule format
|
2013-03-08 15:09:59 -05:00 |
|
Don Mitchell
|
3d9878515e
|
Merge pull request #1634 from MITx/bug/christina/advanced-settings
Need to trigger invalid instead of error, after changes for new version ...
|
2013-03-08 12:03:51 -08:00 |
|
Calen Pennington
|
93db5acc15
|
Make display_name defaulting explicit
|
2013-03-08 14:58:09 -05:00 |
|
cahrens
|
f5dd5d35e9
|
Need to trigger invalid instead of error, after changes for new version of Backbone.
|
2013-03-08 14:51:29 -05:00 |
|
Will Daly
|
607f27e715
|
Fixed undefined variable error in choicegroup.html
|
2013-03-08 14:06:45 -05:00 |
|
Christina Roberts
|
5eb43a627c
|
Merge pull request #1632 from MITx/fix/zoldak/lettuce-click
Fix lettuce tests so all studio ones are working and faster
|
2013-03-08 11:04:50 -08:00 |
|
Chris Dodge
|
e4dea025d0
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-03-08 13:53:25 -05:00 |
|
Chris Dodge
|
5e3b084c1a
|
fix regression where wrap_xmodule_display got set to True for 'about' and 'info'
|
2013-03-08 13:50:58 -05:00 |
|
Calen Pennington
|
79ad2ecd39
|
Only run setup_debug once the page has finished loading
|
2013-03-08 13:39:19 -05:00 |
|
Jay Zoldak
|
c5a9ec5e86
|
Speed up the lettuce test for no policy settings.
|
2013-03-08 13:34:28 -05:00 |
|
Jay Zoldak
|
3c3f6c3cbe
|
Revert lettuce css_find function to not fail if it does not find the element.
|
2013-03-08 13:34:28 -05:00 |
|
Calen Pennington
|
1962d247bf
|
Make allow_anonymous and allow_anonymous_to_peers use field access in templates
|
2013-03-08 13:23:06 -05:00 |
|
Calen Pennington
|
d8b99e1e8e
|
Make remote_gradebook use the new field instead of metadata
|
2013-03-08 13:21:58 -05:00 |
|
Calen Pennington
|
c1a8c6de63
|
Return children from timelimit module definition_from_xml in the new format (separate from definition)
|
2013-03-08 12:59:11 -05:00 |
|
Calen Pennington
|
4fd1b93692
|
Fix bad merge in discussion utils
|
2013-03-08 12:56:17 -05:00 |
|
Brian Talbot
|
3bc73de1b4
|
studio - changed order of Sass import to account for variables needed in architecture
|
2013-03-08 12:56:00 -05:00 |
|
Brian Talbot
|
786ffd1092
|
studio - further small cleanup on Sass
|
2013-03-08 12:44:24 -05:00 |
|
Brian Talbot
|
e9a2413c04
|
studio - further small cleanup on Sass
|
2013-03-08 12:35:28 -05:00 |
|
Calen Pennington
|
5e6469599d
|
Use the correct format for specifying ruby version
|
2013-03-08 12:28:04 -05:00 |
|
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
|
0d4e2b6318
|
Update to ruby 1.9.3, which is what's installed on production servers
|
2013-03-08 12:19:05 -05:00 |
|
Calen Pennington
|
8ae336792a
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
|
2013-03-08 12:00:10 -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 |
|
Calen Pennington
|
972fed2e44
|
Set position just-in-time when rendering sequences for the first time
|
2013-03-08 09:15:27 -05:00 |
|
Peter Baratta
|
49f85211fa
|
More documentation for the javascript
|
2013-03-08 03:39:34 -07:00 |
|
Victor Shnayder
|
96541c434e
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
|
2013-03-08 00:43:46 -05:00 |
|
Victor Shnayder
|
b0790921a3
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-03-08 00:43:39 -05:00 |
|