Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• d039776218 Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio Vik Paruchuri 2013-03-01 15:25:53 -05:00
• 724c6c9eaa reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident. Chris Dodge 2013-03-01 15:25:36 -05:00
• d7c28bfa11 Don't usurp ValidatingView's error handling. #219 cahrens 2013-03-01 15:24:56 -05:00
• 67b73242ea added advanced component button with ability to specify components in course policy. Arthur Barrett 2013-03-01 15:11:42 -05:00
• 5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc Don Mitchell 2013-03-01 12:09:20 -08:00
• d6df7e2d96 Added comments to clean_message_html Will Daly 2013-03-01 15:04:01 -05:00
• a204bff298 Merge pull request #1576 from MITx/feature/jkarni/newjsme jkarni 2013-03-01 11:58:19 -08:00
• 3203360e9e Removed console.logs Julian Arni 2013-03-01 14:57:38 -05:00
• 29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc. #213 cahrens 2013-03-01 14:55:38 -05:00
• 9f020e228b Add in some dummy values Vik Paruchuri 2013-03-01 14:50:40 -05:00
• b39bbec23e Fixed many more broken references in css Julian Arni 2013-03-01 14:43:28 -05:00
• d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. cahrens 2013-03-01 14:39:49 -05:00
• 11f864f489 Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime David Ormsbee 2013-03-01 11:37:46 -08:00
• 6ccd496add Fixing broken split-button-arrow-focus link Julian Arni 2013-03-01 14:22:41 -05:00
• f4032caeaf Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged Calen Pennington 2013-03-01 14:13:58 -05:00
• a818191297 Prelim support for combinedopenended and peergrading types Vik Paruchuri 2013-03-01 14:12:04 -05:00
• 530051037d adding annotatable module template Arthur Barrett 2013-03-01 13:58:39 -05:00
• c24ba23e54 Move self assessment templates Vik Paruchuri 2013-03-01 13:45:55 -05:00
• b0c2559de8 Switch around template locations Vik Paruchuri 2013-03-01 13:43:01 -05:00
• 82544f2ae1 start adding jasmine tests to module Arthur Barrett 2013-03-01 13:39:51 -05:00
• 09ff623561 Updated version of JSME. Julian Arni 2013-03-01 13:38:35 -05:00
• 6dba2394b2 enable studio authoring (raw) for xmodule Arthur Barrett 2013-03-01 13:32:56 -05:00
• b3d0abbd05 Start to move around templates Vik Paruchuri 2013-03-01 13:31:54 -05:00
• d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export VikParuchuri 2013-03-01 09:32:08 -08:00
• 3908ada4ca Merge pull request #1575 from MITx/feature/edz/lock-requirements Calen Pennington 2013-03-01 09:20:09 -08:00
• a3ed2d156d locking django-nose and numpy versions e0d 2013-03-01 12:08:20 -05:00
• d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode David Ormsbee 2013-03-01 08:26:21 -08:00
• e1fcf4c317 Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries David Ormsbee 2013-03-01 08:24:30 -08:00
• f8893e9cc1 Updated custom response documentation Will Daly 2013-03-01 11:19:39 -05:00
• 8265181477 If there are multiple inputs, but only one message specified, the message is now applied to the entire response. Will Daly 2013-03-01 11:17:31 -05:00
• c581ecd897 Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions Calen Pennington 2013-03-01 08:10:56 -08:00
• c3da73ed1e Changed title of custom response doc. Added custom response doc to index Will Daly 2013-03-01 10:57:57 -05:00
• b400b575d0 Merge pull request #1567 from MITx/jth/admindash John Hess 2013-03-01 07:56:32 -08:00
• 1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking David Ormsbee 2013-03-01 10:54:57 -05:00
• 8a953241c1 first pass Your Name 2013-03-01 10:45:48 -05:00
• 4e10eb10e3 locking deps versions based on pip freeze in production. e0d 2013-03-01 10:15:07 -05:00
• bfe2809a87 Merge branch 'master' into bugfix/dave/too_many_sql_queries David Ormsbee 2013-03-01 10:11:35 -05:00
• 9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are passed as the message (even when there's no root tag) Will Daly 2013-03-01 09:35:37 -05:00
• 952716af13 Added clean-up code for message HTML. If overall message is a parseable XHTML tree, it is inserted as a tree rather than text. Will Daly 2013-03-01 09:02:04 -05:00
• 68cf4c4535 Added tests for HTMl rendering of problems Added support for rendering response messages Will Daly 2013-02-28 17:26:10 -05:00
• 9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied in the update() method * Implemented CustomResponse behavior for returning overall_message, with unit tests * Added additional CustomResponse unit tests for exception handling Will Daly 2013-02-28 13:12:43 -05:00
• 3dd49881c3 * Wrote unit tests for correctmap. * Fixed potential KeyError in correctmap.get_queue_time_str() * Modified correctmap.get_npoints() to return 0 if answer is incorrect, even when npoints has been set. * Added overall_message attribute to CorrectMap to allow messages that apply to the entire question, not just an individual input Will Daly 2013-02-28 10:59:29 -05:00
• 32e5f72c16 Remove .redcar folder Calen Pennington 2013-03-01 08:15:38 -05:00
• 228e749d23 Merge pull request #1571 from MITx/marketing/faq-and-media VikParuchuri 2013-02-28 17:47:42 -08:00
• 86b91e2dc0 add a question about account changes to the help page Victor Shnayder 2013-02-28 20:44:18 -05:00
• 57ea68b2a8 Merge pull request #1570 from MITx/marketing/faq-and-media VikParuchuri 2013-02-28 17:27:05 -08:00
• 9cde21b591 Update edX media kit (LH #221) Victor Shnayder 2013-02-28 20:16:19 -05:00
• f0a4691914 Update student FAQ (LH #213) Victor Shnayder 2013-02-28 20:16:06 -05:00
• 3d4510ab0c fixed sass compiler issue with annotatable xmodule on cms Arthur Barrett 2013-02-28 18:35:32 -05:00
• 136946a334 Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule Victor Shnayder 2013-02-28 18:22:13 -05:00
• 0461d72884 fixed tag prompt default text Arthur Barrett 2013-02-28 16:31:15 -05:00
• 179a4af5e7 fixed failing annotationinput test and refactored response factory Arthur Barrett 2013-02-28 15:37:14 -05:00
• 3f40781612 adjusted "incorrect" icon placement when no annotation options submitted. Arthur Barrett 2013-02-28 14:24:53 -05:00
• 430449501e deleting test file Arthur Barrett 2013-02-28 14:06:46 -05:00
• 1b9d105e35 Merge pull request #1568 from MITx/bug/christina/misc Christina Roberts 2013-02-28 10:48:08 -08:00
• 6b74dcf782 adding unit test for annotationinput Arthur Barrett 2013-02-28 13:38:29 -05:00
• 2be42b8f51 Don't require text tag around multiple choice/checkbox answers. https://edx.lighthouseapp.com/projects/102637/tickets/196 cahrens 2013-02-28 13:33:04 -05:00
• 15f6edc2f2 Merge branch 'master' into feature/abarrett/annotatable_xmodule Arthur Barrett 2013-02-28 13:11:40 -05:00
• bc6a085fdf converted annotationinput tests to the new responsetype testing format. Arthur Barrett 2013-02-28 13:10:37 -05:00
• e9dacfae09 remove self.contents from ConditionalModule Vasyl Nakvasiuk 2013-02-28 20:07:59 +02:00
• 69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor Christina Roberts 2013-02-28 10:02:09 -08:00
• 1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master. Arthur Barrett 2013-02-28 11:22:32 -05:00
• 02e30f5072 Cleaned up admin_dashboard code and template John Hess 2013-02-28 11:11:57 -05:00
• 2f5e1b9cc0 Readable admin_dashboard John Hess 2013-02-28 10:54:57 -05:00
• 1ebc3b314d Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation Christina Roberts 2013-02-28 07:28:48 -08:00
• 9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests Diana Huang 2013-02-28 07:05:15 -08:00
• 456972de5c Merge pull request #1562 from MITx/feature/jarv/org-staff-access David Ormsbee 2013-02-28 06:53:56 -08:00
• 71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files were not being compiled before the LoncapaProblem initializer was called. Will Daly 2013-02-28 09:45:27 -05:00
• 8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. Chris Dodge 2013-02-28 09:40:30 -05:00
• 38830f001f Merge pull request #1564 from MITx/bug/christina/misc Don Mitchell 2013-02-28 06:29:34 -08:00
• 9fe9e2fbf6 upadte latex2edx url in latex-problem template ichuang 2013-02-28 04:19:39 +00:00
• b75ccbdcce address Christina's comments re js in latex2edx source-edit.html ichuang 2013-02-28 04:18:16 +00:00
• 905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. Chris Dodge 2013-02-27 22:37:13 -05:00
• e42cdfbd29 turn off metadata inheritence for a quick test Chris Dodge 2013-02-27 21:45:17 -05:00
• d0bbb0f6c9 use a different query to get all collections. Also don't apply inheritance to course modules, because that's ultimately a no-op Chris Dodge 2013-02-27 20:43:49 -05:00
• f33c575412 Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff Victor Shnayder 2013-02-27 15:25:36 -08:00
• e47d11bedc Bug fix for #214. cahrens 2013-02-27 17:36:28 -05:00
• c0f0ef0cd2 Bug fix for #214. cahrens 2013-02-27 17:34:08 -05:00
• 7e48de1ef3 Reset responsetypes.py to version on master Will Daly 2013-02-27 17:22:26 -05:00
• 907cd50503 fix viewing of pdfbook on firefox Brian Wilson 2013-02-27 17:09:50 -05:00
• 487afad50d Merge branch 'master' into feature/will/move_correct_mark_for_multiple_choice Will Daly 2013-02-27 16:58:35 -05:00
• bc49d50fc2 fixed the max points in the annotation response Arthur Barrett 2013-02-27 16:53:17 -05:00
• 043d316d53 Removed test files that are now replaced with XML Factories Will Daly 2013-02-27 16:40:48 -05:00
• ce7256eda9 Removed unused SymbolicResponseXMLFactory Will Daly 2013-02-27 16:40:05 -05:00
• 8f89768d62 added annotationresponse grade test Arthur Barrett 2013-02-27 16:29:25 -05:00
• c1324ec21d Modified CodeResponse to use XML factory Will Daly 2013-02-27 16:25:19 -05:00
• 48242d3a06 Adding instructor_<org> John Jarvis 2013-02-27 15:30:07 -05:00
• 6e4c418a11 Updated JavscriptResponse to use XML factory Will Daly 2013-02-27 15:26:29 -05:00
• 2f4d6f7bbf fixed doc block for annotationinput Arthur Barrett 2013-02-27 15:25:04 -05:00
• 8543235306 Merge pull request #1558 from MITx/fix/will/symmath_check_unit_tests Victor Shnayder 2013-02-27 12:19:47 -08:00
• 3f81fe010c Implemented tests for ImageResponse Will Daly 2013-02-27 15:05:21 -05:00
• ce2f1400e6 formatting John Jarvis 2013-02-27 15:05:02 -05:00
• 1a0220c765 added a validation check on the input choice attribute Arthur Barrett 2013-02-27 15:04:30 -05:00
• 7c0d9ff156 Creating group for organization staff access John Jarvis 2013-02-27 14:55:17 -05:00
• 44a68e6903 added partially correct icon from marco Arthur Barrett 2013-02-27 14:36:14 -05:00
• 53b3b79f96 Implemented tests of hints for <formularesponse> Will Daly 2013-02-27 14:13:49 -05:00
• b84d0ba8ba updated comments Arthur Barrett 2013-02-27 14:04:49 -05:00
• 9f8e172be9 show the status mark next to the submitted tag instead of at the bottom of the problem. Arthur Barrett 2013-02-27 13:35:10 -05:00
• 1ed2720977 Merge pull request #1560 from MITx/bug/btalbot/studio-codemirrorlineheight Christina Roberts 2013-02-27 10:11:03 -08:00
• 73ae818958 studio - fixing padding of codeMirror fields to match height of others given new line height Brian Talbot 2013-02-27 13:08:56 -05:00