Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• fb407e3cb8 Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error Carlos Andrés Rocha 2013-03-08 14:30:59 -08:00
• 89ea88cdf2 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged cahrens 2013-03-08 16:09:01 -05:00
• a68cdd35d8 Add advanced_modules course setting back in. cahrens 2013-03-08 16:07:59 -05:00
• 035829289e Parse weight as a float when reading from a string Calen Pennington 2013-03-08 16:01:27 -05:00
• 7eee7a0d2a Merge pull request #1635 from MITx/fix/cale/handle-grading-json-breakage e0d 2013-03-08 12:47:37 -08:00
• 8bb0c64ff9 Set grading policy to an empty dict if it can't be decoded from json Calen Pennington 2013-03-08 15:36:19 -05:00
• e3f7e6024f Only display settings in the cms advanced settings page Calen Pennington 2013-03-08 15:22:49 -05:00
• 248ce8803b Make annotable module use the new xmodule format Calen Pennington 2013-03-08 15:09:59 -05:00
• 3d9878515e Merge pull request #1634 from MITx/bug/christina/advanced-settings Don Mitchell 2013-03-08 12:03:51 -08:00
• 93db5acc15 Make display_name defaulting explicit Calen Pennington 2013-03-08 14:58:04 -05:00
• f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. cahrens 2013-03-08 14:51:29 -05:00
• 607f27e715 Fixed undefined variable error in choicegroup.html Will Daly 2013-03-08 14:06:45 -05:00
• 5eb43a627c Merge pull request #1632 from MITx/fix/zoldak/lettuce-click Christina Roberts 2013-03-08 11:04:50 -08:00
• e4dea025d0 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Chris Dodge 2013-03-08 13:53:25 -05:00
• 5e3b084c1a fix regression where wrap_xmodule_display got set to True for 'about' and 'info' Chris Dodge 2013-03-08 13:50:58 -05:00
• 79ad2ecd39 Only run setup_debug once the page has finished loading Calen Pennington 2013-03-08 13:39:19 -05:00
• c5a9ec5e86 Speed up the lettuce test for no policy settings. Jay Zoldak 2013-03-08 12:55:01 -05:00
• 3c3f6c3cbe Revert lettuce css_find function to not fail if it does not find the element. Jay Zoldak 2013-03-08 12:29:44 -05:00
• 1962d247bf Make allow_anonymous and allow_anonymous_to_peers use field access in templates Calen Pennington 2013-03-08 13:22:27 -05:00
• d8b99e1e8e Make remote_gradebook use the new field instead of metadata Calen Pennington 2013-03-08 13:21:58 -05:00
• c1a8c6de63 Return children from timelimit module definition_from_xml in the new format (separate from definition) Calen Pennington 2013-03-08 12:59:11 -05:00
• 4fd1b93692 Fix bad merge in discussion utils Calen Pennington 2013-03-08 12:56:17 -05:00
• 3bc73de1b4 studio - changed order of Sass import to account for variables needed in architecture Brian Talbot 2013-03-08 12:56:00 -05:00
• 786ffd1092 studio - further small cleanup on Sass Brian Talbot 2013-03-08 12:44:24 -05:00
• e9a2413c04 studio - further small cleanup on Sass Brian Talbot 2013-03-08 12:35:28 -05:00
• 5e6469599d Use the correct format for specifying ruby version Calen Pennington 2013-03-08 12:28:04 -05:00
• f2a495bfeb Merge branch 'master' into fix/btalbot/studio-sasscleanup Brian Talbot 2013-03-08 12:23:10 -05:00
• 6418d033dd studio - adding files I forgot to add when cleaning up Sass and originally committing Brian Talbot 2013-03-08 12:20:40 -05:00
• 0d4e2b6318 Update to ruby 1.9.3, which is what's installed on production servers Calen Pennington 2013-03-08 12:19:05 -05:00
• 8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Calen Pennington 2013-03-08 12:00:10 -05:00
• d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics Calen Pennington 2013-03-08 08:59:44 -08:00
• fab07597d2 Use https to talk to rubygems Calen Pennington 2013-03-08 11:59:02 -05:00
• 928ecb98fc Merge branch 'master' into fix/btalbot/studio-sasscleanup Brian Talbot 2013-03-08 11:47:51 -05:00
• 3b2c970248 studio - reorganized and documented used Sass for studio Brian Talbot 2013-03-08 11:47:11 -05:00
• 849e8d6cdc Merge pull request #1630 from MITx/fix/zoldak/lettuce-click Christina Roberts 2013-03-08 08:23:01 -08:00
• 55eefd0ef6 Fix test that sets release date to work on all platforms Jay Zoldak 2013-03-08 11:11:32 -05:00
• 24d088933e Fix intermittent lettuce test failure on ubuntu. Jay Zoldak 2013-03-07 11:37:34 -05:00
• 1f30baabfd Change default browser for lettuce back to chrome. Jay Zoldak 2013-03-07 11:23:58 -05:00
• 21e7bc5128 More robust handling for finding and clicking on objects by css. Tag tests not working under PhantomJS to skip for now. Jay Zoldak 2013-03-07 11:01:15 -05:00
• b66d0cf5da Fix signup test on ubuntu Jay Zoldak 2013-03-05 17:15:17 -05:00
• ad5d2a9624 Update update_templates reference Jay Zoldak 2013-03-05 14:32:06 -05:00
• e84fa63826 Catch WebDriverException Jay Zoldak 2013-03-04 15:50:25 -05:00
• 21c15d8f1f Click in the upper left of an element instead of the middle. Jay Zoldak 2013-03-04 15:35:09 -05:00
• 3cec8f1a76 Catch WebDriverException Jay Zoldak 2013-03-04 15:50:25 -05:00
• b9e5ed9525 Click in the upper left of an element instead of the middle. Jay Zoldak 2013-03-04 15:35:09 -05:00
• ae610aebaa Set the dogapi version Calen Pennington 2013-03-08 10:48:55 -05:00
• cd802d8e14 Add datadog metrics capture around heartbeat timing Calen Pennington 2013-03-08 10:36:59 -05:00
• e7bf05ea54 Merge pull request #1627 from MITx/fix/will/update_correctmap_npoints_test Jay Zoldak 2013-03-08 07:29:34 -08:00
• ffec9c4866 Merge pull request #1626 from MITx/fix/cale/module-render-500-fix David Ormsbee 2013-03-08 07:09:48 -08:00
• a44c0932d2 Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user Calen Pennington 2013-03-08 10:08:39 -05:00
• 352126b417 Updated tests for correct_map to match changes made to get_npoints Will Daly 2013-03-08 10:08:20 -05:00
• 972fed2e44 Set position just-in-time when rendering sequences for the first time Calen Pennington 2013-03-08 09:15:27 -05:00
• 49f85211fa More documentation for the javascript Peter Baratta 2013-03-08 03:39:34 -07:00
• 96541c434e Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Victor Shnayder 2013-03-08 00:43:46 -05:00
• b0790921a3 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Victor Shnayder 2013-03-08 00:43:39 -05:00
• 84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Victor Shnayder 2013-03-08 00:40:18 -05:00
• 5644d08172 Merge pull request #1625 from MITx/hotfix/dave/missing_npoints Victor Shnayder 2013-03-07 20:54:19 -08:00
• 5f44b2de04 minor comment on partial credit David Ormsbee 2013-03-07 23:52:01 -05:00
• 30f3923c15 Quick patch to regression causing partial credit to break on 6.00x David Ormsbee 2013-03-07 23:50:09 -05:00
• c43d4b3469 re-added Students with correct answers to analytics dashboard David Ormsbee 2013-03-07 23:39:10 -05:00
• 4c72dbfce3 fix fat fingers? Chris Dodge 2013-03-07 22:03:38 -05:00
• c18461342e Merge pull request #1624 from MITx/diana/fix-problem-javascript Victor Shnayder 2013-03-07 16:41:11 -08:00
• 2c6ee50ac3 Fix issue where javascript was disappearing from problem html Diana Huang 2013-03-07 19:39:43 -05:00
• 49dee5080a first pass at chapter navigation Brian Wilson 2013-03-07 18:45:00 -05:00
• b02ff247cb Merge pull request #1623 from MITx/fix/will/checkbox_bug Victor Shnayder 2013-03-07 14:05:52 -08:00
• 6a54c2a2bc Fixed checkbox bug in capa_module Will Daly 2013-03-07 17:01:56 -05:00
• af058c2cb2 Merge pull request #1622 from MITx/fix/cdodge/static-url-allow-references-to-common Christina Roberts 2013-03-07 13:19:23 -08:00
• c23c5cc3d9 add comments Chris Dodge 2013-03-07 16:12:21 -05:00
• cb70a0f9d9 Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common Christina Roberts 2013-03-07 13:07:16 -08:00
• 60b060263c refactor highlight css to prevent issues with cascade Arthur Barrett 2013-03-07 16:02:22 -05:00
• 85d5264f5b Merge pull request #1616 from MITx/fix/will/mc_checkbox_bug Christina Roberts 2013-03-07 12:47:16 -08:00
• 891bddcdf9 need to support link references to static content that is in the code base (e.g. module's .js/.css) Chris Dodge 2013-03-07 14:28:09 -05:00
• 49db56ab7d Merge pull request #1618 from MITx/bug/christina/misc Don Mitchell 2013-03-07 11:02:52 -08:00
• 98e410816e New version of Backbone has separate invalid event. cahrens 2013-03-07 13:52:55 -05:00
• 9ec33928ce New version of Backbone has separate invalid event. cahrens 2013-03-07 13:37:10 -05:00
• f5c3775b5d fixed the annotation tooltip line height so it is the same in studio and the lms. Arthur Barrett 2013-03-07 12:21:47 -05:00
• e86ed0db91 Merge branch 'master' into fix/will/mc_checkbox_bug Will Daly 2013-03-07 12:07:34 -05:00
• 4d136f8d3b fixed annotation tooltip styling issue in studio Arthur Barrett 2013-03-07 11:51:45 -05:00
• afa704c253 Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-03-07 11:38:07 -05:00
• 559a311acb studio - alerts: refactored static alerts demo view to have a different template/view/url name to help with user facing views vs. documentation views Brian Talbot 2013-03-07 11:37:15 -05:00
• 19eb6a3449 Merge pull request #1617 from MITx/bug/christina/misc chrisndodge 2013-03-07 08:31:44 -08:00
• 4434ca632e Disable Django toolbar-- breaking mongo updates. cahrens 2013-03-07 11:30:00 -05:00
• 8d83d2fb4e Added handling of condition when no multiple choice item selected, but the answer is incorrect. Will Daly 2013-03-07 10:52:19 -05:00
• 2e23a5f584 Merge pull request #1615 from MITx/fix/cdodge/error-importing-metadata-with-empty-strings Don Mitchell 2013-03-07 07:51:17 -08:00
• 8b0c30e69f Fixed small typo. Valera Rozuvan 2013-03-07 17:48:40 +02:00
• 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. Chris Dodge 2013-03-07 10:43:36 -05:00
• 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. Will Daly 2013-03-07 10:17:03 -05:00
• c144795588 Re-enable a couple of analytics on the dashboard to test layout David Ormsbee 2013-03-07 10:01:56 -05:00
• 1b7863e79e Merge pull request #1603 from MITx/fix/will/merge_jnater_unittests Jay Zoldak 2013-03-07 06:47:55 -08:00
• aee7d85694 fix bug in tabs Brian Wilson 2013-03-07 02:01:42 -05:00
• 75872e1d28 remove getting of descriptor. location isn't defined here so it blows up. Anyhow, the descriptor is being passed into the function, so we don't need to fetch... Chris Dodge 2013-03-06 22:28:44 -05:00
• 5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore Victor Shnayder 2013-03-06 17:32:29 -08:00
• 6af857b3fe Merge pull request #1613 from MITx/victor/fix-blank-capa Victor Shnayder 2013-03-06 17:18:38 -08:00
• b6a6e10bb5 Fix max_attempts='' Victor Shnayder 2013-03-06 20:16:24 -05:00
• 28e300c033 Merge pull request #1612 from MITx/victor/fix-genex-css John Hess 2013-03-06 16:14:09 -08:00
• 57700a56d4 remove links to missing image files. We can add them if needed later. Victor Shnayder 2013-03-06 19:11:36 -05:00
• 094b18972c Append course modules to list of courses during import Calen Pennington 2013-03-06 18:14:14 -05:00
• cec3475c9d Remove references to .definition and .metadata in modules Calen Pennington 2013-03-06 18:07:56 -05:00
• b5ab766092 initial framework for htmlbook Brian Wilson 2013-03-06 17:57:33 -05:00
• 5b12793aee Merge pull request #1597 from MITx/docs/valera/drag_and_drop David Ormsbee 2013-03-06 14:55:02 -08:00