Commit Graph

11431 Commits

Author SHA1 Message Date
Calen Pennington
07059d0dfc Iterate over metadata items when setting module info 2013-03-11 14:32:56 -04:00
Calen Pennington
7e1349775c Don't write data to metadata when updating course grading 2013-03-11 13:53:59 -04:00
Calen Pennington
a943117608 Log ErrorDescriptor creation as a warning 2013-03-11 13:42:07 -04:00
Calen Pennington
c1dbd98526 Fix bad reference to item_location 2013-03-11 13:07:28 -04:00
Calen Pennington
7b5427006c Save lcp state on initialization (for seed initialization) 2013-03-11 12:25:45 -04:00
Calen Pennington
881e137fb0 Save lcp state when a problem is saved 2013-03-11 12:23:24 -04:00
Calen Pennington
95f8f811c5 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
Calen Pennington
9c85d920ee Fixing tests created on master 2013-03-11 10:48:06 -04:00
David Ormsbee
43ec6eaa52 Merge pull request #1639 from MITx/feature/dave/delft_logo
Update of Delft logo (lighthouse ticket #234)
2013-03-11 07:21:55 -07:00
David Ormsbee
a8ff7911f6 Update of Delft logo (lighthouse ticket #234) 2013-03-11 10:21:03 -04:00
Calen Pennington
1f593428d4 Fix metadata introspection in course admin page 2013-03-08 21:17:19 -05:00
Calen Pennington
6395745c2b Clean up serialization on some fields 2013-03-08 21:17:19 -05:00
Carlos Andrés Rocha
fb407e3cb8 Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error
Fixed undefined variable error in choicegroup.html
2013-03-08 14:30:59 -08:00
cahrens
89ea88cdf2 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-08 16:09:01 -05:00
cahrens
a68cdd35d8 Add advanced_modules course setting back in. 2013-03-08 16:07:59 -05:00
Calen Pennington
035829289e Parse weight as a float when reading from a string 2013-03-08 16:01:27 -05:00
e0d
7eee7a0d2a Merge pull request #1635 from MITx/fix/cale/handle-grading-json-breakage
Set grading policy to an empty dict if it can't be decoded from json
2013-03-08 12:47:37 -08:00
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
Calen Pennington
5e6469599d Use the correct format for specifying ruby version 2013-03-08 12:28:04 -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
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