Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• d2f9b27d8e Merge pull request #1611 from MITx/fix/brian/doc-pdfbook David Ormsbee 2013-03-06 14:54:36 -08:00
• 9c92c92fda add textbook and pdf textbook documentation Brian Wilson 2013-03-06 17:35:32 -05:00
• 3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex jkarni 2013-03-06 14:35:01 -08:00
• af3c92c47e Remove old cms templates Calen Pennington 2013-03-06 17:28:25 -05:00
• 73bca8afd2 Merge pull request #1610 from MITx/fix/diana/fix-annotation-tests Jay Zoldak 2013-03-06 14:11:47 -08:00
• ba69392f70 Fix inaccurate instructions around import Calen Pennington 2013-03-06 17:10:45 -05:00
• d0bff1ed3c Merge branch 'master' into jmpm-analytics David Ormsbee 2013-03-06 17:09:09 -05:00
• 5c3dfd9280 Update correctmap to handle partially correct answers, and fix annotation tests so that they use the new test_system functionality Diana Huang 2013-03-06 16:43:12 -05:00
• 5222c61d73 Fix how the 'empty' field is excluded from html_module editable fields Calen Pennington 2013-03-06 16:34:21 -05:00
• 05211d4fe8 Merge pull request #1607 from MITx/feature/christina/djdebug chrisndodge 2013-03-06 13:14:19 -08:00
• 62514d85a3 studio - alerts: loosely wired advanced settings with new notification and alert messages Brian Talbot 2013-03-06 15:36:38 -05:00
• 4327aa1885 If we can't parse policy, then set it to an empty dictionary Calen Pennington 2013-03-06 15:18:03 -05:00
• 4cbae2269c Clean up how grading policy is set Calen Pennington 2013-03-06 15:12:54 -05:00
• e7900859b6 Remove the 'title' alias for lms.display_name Calen Pennington 2013-03-06 15:11:08 -05:00
• 12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation Victor Shnayder 2013-03-06 12:09:03 -08:00
• fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule Victor Shnayder 2013-03-06 12:05:27 -08:00
• 9a7b6c7eaf Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-03-06 15:04:34 -05:00
• 42e711e7d2 Update tests and documentation. Diana Huang 2013-03-06 14:53:13 -05:00
• fb08942b63 Add 'get' default string Julian Arni 2013-03-06 14:49:36 -05:00
• 1aa3580dcb Switch over to using the inputtype ajax handler for chemical input. Diana Huang 2013-03-05 17:04:23 -05:00
• dfc9176f6b fixed typo Arthur Barrett 2013-03-06 14:40:35 -05:00
• ddbab36439 Added instructions/documentation to the studio template for content authors. Arthur Barrett 2013-03-06 14:33:04 -05:00
• 7af36eb633 Merge pull request #1598 from MITx/diana/capa-input-ajax Victor Shnayder 2013-03-06 11:30:28 -08:00
• de225e6623 Enable Django debug toolbar on Studio (including Mongo panel). cahrens 2013-03-06 14:08:54 -05:00
• 5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule Arthur Barrett 2013-03-06 13:51:18 -05:00
• fd49aceb29 fixed highlight style for cascade. Arthur Barrett 2013-03-06 13:36:11 -05:00
• d05e82e35c Merge branch 'master' into feature/jkarni/genex Julian Arni 2013-03-06 13:25:30 -05:00
• 9b32400b3a tweaked commentary textarea size so it looks correct in ff Arthur Barrett 2013-03-06 13:18:52 -05:00
• 3b7a589e5a Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged Calen Pennington 2013-03-06 12:58:24 -05:00
• aa026387ce Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Vasyl Nakvasiuk 2013-03-06 19:52:28 +02:00
• 493421c1ec fix test_conditional, add new conditional to "conditional_and_poll" test course Vasyl Nakvasiuk 2013-03-06 19:52:18 +02:00
• 7871fce7ff Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes Vik Paruchuri 2013-03-06 12:49:11 -05:00
• b75b091581 Remove 2 more debug statements Vik Paruchuri 2013-03-06 12:27:22 -05:00
• c1218e8c08 Remove debug statements Vik Paruchuri 2013-03-06 12:26:23 -05:00
• 8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged Calen Pennington 2013-03-06 12:15:07 -05:00
• 69601047f2 Merge pull request #1605 from MITx/bug/christina/misc Don Mitchell 2013-03-06 08:59:11 -08:00
• f73979d03b Generate less db inserts Vik Paruchuri 2013-03-06 11:57:14 -05:00
• b706d4a1f5 Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox. #225 cahrens 2013-03-06 11:50:23 -05:00
• d20fc439ec Fix peer grading boolean parsing Vik Paruchuri 2013-03-06 11:47:48 -05:00
• 3329af077a Force instance state to save periodically Vik Paruchuri 2013-03-06 11:29:25 -05:00
• 7ea3d70c2c Caching attribute values from child module Vik Paruchuri 2013-03-06 11:21:42 -05:00
• dfa590e71c Make exception a little more specific Julian Arni 2013-03-06 11:10:13 -05:00
• 5682e02f53 Fix indendation that was causing only first submission to be saved Julian Arni 2013-03-06 11:05:10 -05:00
• 4b7d1deb25 Fix a bug in extracting HTML Update tests to reflect new behavior. Diana Huang 2013-03-06 10:34:57 -05:00
• e1b99186ef Removed test_permissions.py Will Daly 2013-03-06 10:20:02 -05:00
• 2f5ea630e7 Cleaned up courseware test_tabs unittests Will Daly 2013-03-06 10:16:43 -05:00
• 3270caed83 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Vasyl Nakvasiuk 2013-03-06 17:10:27 +02:00
• 06001c8c1e fix test_logic Vasyl Nakvasiuk 2013-03-06 17:10:15 +02:00
• 0d1b380008 Removed test_grades.py in courseware django app. Will Daly 2013-03-06 09:44:53 -05:00
• 72411a175f Added jnater's unit tests, cleaned up broken tests, ran pep8fix Will Daly 2013-03-06 09:41:26 -05:00
• 455dea870f Remove unnecessary import. Diana Huang 2013-03-06 09:21:37 -05:00
• 78424e1670 Fix some of the tests so that they work with the new changes to capa_problem Diana Huang 2013-03-06 09:19:22 -05:00
• 17680a332a More comments. Diana Huang 2013-03-05 13:26:53 -05:00
• 9b640aa06b Add more documentation and fix naming. Diana Huang 2013-03-05 13:24:38 -05:00
• 385a62d7d1 Handle multiple inputs properly for ajax handling. Diana Huang 2013-03-05 11:11:55 -05:00
• 6f535d9e0b Fix test rendering so we can parse the problem during tests without it breaking. Diana Huang 2013-03-05 09:20:40 -05:00
• 9545a82ab9 Add the ability to make ajax calls on the input type of capa problems. Diana Huang 2013-03-04 15:48:20 -05:00
• f8adfc6244 Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests Diana Huang 2013-03-06 06:03:17 -08:00
• 14873e6465 Reorderd xmodule storage migrations Calen Pennington 2013-03-06 08:45:32 -05:00
• c6545eb092 Begin to document symmath as we go Peter Baratta 2013-03-06 06:21:08 -07:00
• bb69e9fab6 fix dnd tests Vasyl Nakvasiuk 2013-03-06 14:30:29 +02:00
• f71c43f77b fix self.excess_draggables Vasyl Nakvasiuk 2013-03-06 14:28:10 +02:00
• b82212ed0c Merge branch 'master' into peter/symbolic Peter Baratta 2013-03-06 05:16:34 -07:00
• 0424b53336 show the annotation callout at the span center rather than at the mouse Arthur Barrett 2013-03-05 23:49:02 -05:00
• 3393e6385d set a default height on the commentary textbox to show 5 lines of text Arthur Barrett 2013-03-05 23:45:36 -05:00
• 2ed7394f27 visually distinguish instructions from guided discussion section Arthur Barrett 2013-03-05 23:44:35 -05:00
• b7c6f7ca1a Mostly working state Vik Paruchuri 2013-03-05 19:16:02 -05:00
• 0d777a7a0e Convert to passing in current task state again Vik Paruchuri 2013-03-05 17:53:06 -05:00
• cde4cdf839 starting pdfbook doc Brian Wilson 2013-03-05 17:51:44 -05:00
• 904ed6c80f Combined open ended renders correctly, but internal state tracking broken Vik Paruchuri 2013-03-05 17:48:39 -05:00
• c7d80a91ee Changed name of survey_question to is_survey_question for clarity Will Daly 2013-03-05 17:30:38 -05:00
• 43d8574e92 Refactored use of test_system in xmodule unit tests so that a new one is created for each test Will Daly 2013-03-05 17:26:15 -05:00
• 73281a43c9 Added tests for get_problem_html, including error conditions Will Daly 2013-03-05 17:02:12 -05:00
• 697e426ce6 Switch to passing through entire task state Vik Paruchuri 2013-03-05 16:58:59 -05:00
• 40d7e8addf Moved problem HTML error handling to its own function Will Daly 2013-03-05 15:43:47 -05:00
• 608552429f Refactored capa module HTML rendering, isolating logic for determining which buttons to show Will Daly 2013-03-05 15:35:14 -05:00
• e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio Christina Roberts 2013-03-05 12:28:29 -08:00
• 35551049ef Merge remote-tracking branch 'origin/feature/vik/fix-oe-storage' into feature/alex/poll-merged Calen Pennington 2013-03-05 15:05:47 -05:00
• b7680f3157 Fix tests except for conditional module and open ended grading Calen Pennington 2013-03-05 14:52:20 -05:00
• 102c594e7b Remove string and old import Vik Paruchuri 2013-03-05 15:01:12 -05:00
• 9475c6edac Address review comments Vik Paruchuri 2013-03-05 14:41:08 -05:00
• 5bbb70ef8a Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu. Arthur Barrett 2013-03-05 13:47:02 -05:00
• d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all Victor Shnayder 2013-03-05 10:18:30 -08:00
• a018b8ac38 Merge pull request #1599 from MITx/feature/deena/testing Will Daly 2013-03-05 09:48:23 -08:00
• 42043d2ccc Added tests for capa module save_problem() Will Daly 2013-03-05 12:01:04 -05:00
• b0a018195a Pep8 fixes for tests Jay Zoldak 2013-03-05 11:53:00 -05:00
• 6ec3b94d0c Added test for capa module closed() method; modified closed() to handle edge cases Will Daly 2013-03-05 11:47:41 -05:00
• 49784009d5 Fixed incorrect doc string Will Daly 2013-03-05 11:23:14 -05:00
• 21af0493fd Added unit tests for capa_module reset_problem() Will Daly 2013-03-05 11:21:28 -05:00
• 0d83fefecf merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged Vasyl Nakvasiuk 2013-03-05 18:20:38 +02:00
• cee24c5cb2 Import existing UserFactory Jay Zoldak 2013-03-05 11:18:07 -05:00
• 692c423634 Merge pull request #1600 from MITx/bug/christina/misc chrisndodge 2013-03-05 08:15:54 -08:00
• cc234d45e7 Don't collapse multiple underscores for asset names. #202 cahrens 2013-03-05 10:55:27 -05:00
• c9b2a6a203 updated CSS to use the new advanced icon Arthur Barrett 2013-03-05 10:52:39 -05:00
• fa3961d4dd merged openended and advanced categories per discussion at today's standup Arthur Barrett 2013-03-05 10:51:59 -05:00
• 5b3158444e Merge pull request #1595 from MITx/bug/christina/misc Christina Roberts 2013-03-05 07:50:15 -08:00
• ef9f963f49 studio - advanced modules: added in advanced module button icon per artie/vik work Brian Talbot 2013-03-05 10:39:21 -05:00
• d03fe79e07 Small metadata naming fix Vik Paruchuri 2013-03-05 10:36:22 -05:00
• 2924bd2f53 wip Vik Paruchuri 2013-03-05 10:20:26 -05:00
• 156a702e08 Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-03-05 09:57:35 -05:00