Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• e21048206a comments and refactoring Alexander Kryklia 2013-01-04 11:04:04 +02:00
• bdcf94dd40 comments and pepification Alexander Kryklia 2013-01-03 18:17:13 +02:00
• d9d093099d fixed dirname Alexander Kryklia 2013-01-03 17:52:37 +02:00
• b7be040222 updated case when no rule is processed Alexander Kryklia 2013-01-03 17:38:06 +02:00
• aaf54c562e fix in location id for course Alexander Kryklia 2013-01-03 17:36:57 +02:00
• f283df9022 Cleaning up code. Valera Rozuvan 2013-01-03 16:51:23 +02:00
• 1afaec6f61 update in tests Alexander Kryklia 2013-01-03 16:34:19 +02:00
• 6aaad83abc finished interface change Alexander Kryklia 2013-01-03 16:33:34 +02:00
• 17f11cef07 added comments Alexander Kryklia 2013-01-03 16:18:11 +02:00
• efdc4c7b7c Updated tests for new XML format. Valera Rozuvan 2013-01-03 16:17:55 +02:00
• 16ecdadfc6 changed interface Alexander Kryklia 2013-01-03 16:15:32 +02:00
• 3151378768 removed denied and allowed rule Alexander Kryklia 2013-01-03 15:50:47 +02:00
• 75ff3aaaa0 docs and denied rule refactores Alexander Kryklia 2013-01-03 15:24:13 +02:00
• ab95193252 Bugfixing. Valera Rozuvan 2013-01-03 15:21:18 +02:00
• 17b01071d0 Fixed bug. Valera Rozuvan 2013-01-03 15:11:37 +02:00
• 28f7a68e42 fix grammar Alexander Kryklia 2013-01-03 14:26:14 +02:00
• 586a47a2ad Rewrote functionality to include labels as separate from the container. Fixed bugs. Refactoring. Valera Rozuvan 2013-01-03 14:25:53 +02:00
• 792cd34ce9 documentation for drag and drop inputtype python subclass Alexander Kryklia 2013-01-03 14:18:11 +02:00
• b436e6d4d1 removed debugger call Alexander Kryklia 2013-01-03 14:11:41 +02:00
• 6ed8598f53 added soem tests Alexander Kryklia 2013-01-03 14:10:54 +02:00
• cac564de7e added test for inputtypes Alexander Kryklia 2013-01-03 14:10:42 +02:00
• 5a6e587a55 added case for mocking Alexander Kryklia 2013-01-03 14:10:29 +02:00
• 1cc23e3a4d Bugfixing. Valera Rozuvan 2013-01-03 10:05:30 +02:00
• 2e08ece7ff Fixed drag behavior. Now drag of icon itself rather than container element. This allows for finer selection (no overlap of transparent areas), and positioning of icon precisely onto a target. This breaks labels - TODO fix. Valera Rozuvan 2013-01-03 07:45:49 +02:00
• a0f99ac3ce added case for extra draggables Alexander Kryklia 2013-01-02 17:16:37 +02:00
• 590e63639e added anywhere test Alexander Kryklia 2013-01-02 16:08:47 +02:00
• 961285a4d1 added no_labels flag Alexander Kryklia 2013-01-02 16:08:01 +02:00
• 604c42eb07 added anyof flag Alexander Kryklia 2013-01-02 16:07:49 +02:00
• 37e3181c36 removed unidecode Alexander Kryklia 2013-01-02 13:34:38 +02:00
• ff782fff6c test for drag and drop Alexander Kryklia 2013-01-02 13:34:29 +02:00
• 7ab1325647 extended grader Alexander Kryklia 2013-01-02 13:34:14 +02:00
• 744b7947e6 Added initial docs for Drag and Drop. Valera Rozuvan 2012-12-28 11:00:55 +02:00
• f1f3b2ea8b Slight UI design change. Draggables are now positioned in the center of their container DIV. Valera Rozuvan 2012-12-28 09:52:26 +02:00
• 505fefb802 Initiated DOCS for Drag and Drop. Valera Rozuvan 2012-12-27 18:18:53 +02:00
• 108b0fc384 Refactoring and code documentation. Valera Rozuvan 2012-12-27 18:03:28 +02:00
• f2e930a395 small improvements Alexander Kryklia 2012-12-27 13:27:55 +02:00
• d7801fdabe add test for different keys in correct and iser answer Alexander Kryklia 2012-12-27 12:41:09 +02:00
• 58483319a3 Refactoring. Valera Rozuvan 2012-12-27 12:40:05 +02:00
• 13d53539f6 bug fix: exception when correct answer not contain some user answer Alexander Kryklia 2012-12-27 12:39:37 +02:00
• 3abdd1801d Removed debug comments. Valera Rozuvan 2012-12-27 12:18:51 +02:00
• 9ef0c563ef Slight changes in UI styling. Valera Rozuvan 2012-12-27 12:11:33 +02:00
• 3bbe0759ea Added support for reading answer from input element (as set by server). Valera Rozuvan 2012-12-27 10:36:11 +02:00
• 86d133664a Fixing bugs. Now resize of window does not mess up targets. Dragging is much smoother on touch pad. Removed border from draggable when it is not in slider. The whole applet fits into min-width of main part of page. Valera Rozuvan 2012-12-27 07:43:49 +02:00
• b45fe0e652 update format Alexander Kryklia 2012-12-26 18:11:09 +02:00
• d3264dd877 rename tag Alexander Kryklia 2012-12-26 18:10:42 +02:00
• 3844476314 fixes in algorithm Alexander Kryklia 2012-12-26 17:17:37 +02:00
• dd9cdc1c2f tests for drag and drop Alexander Kryklia 2012-12-26 17:17:12 +02:00
• ff0f21614e started tests and add graders to capa_problem Alexander Kryklia 2012-12-26 15:57:48 +02:00
• f9169613fc Making JS work with the new XML format. Valera Rozuvan 2012-12-26 15:54:15 +02:00
• 4268f04069 Updated JS part to use new XML format. Valera Rozuvan 2012-12-26 15:38:48 +02:00
• 36b1d4f1d0 graders for draganddrop Alexander Kryklia 2012-12-26 15:34:15 +02:00
• 9efe1c0a4b added parameters and rename Alexander Kryklia 2012-12-26 15:33:58 +02:00
• c5d4f54aa2 Slight changes to UI design. Part 2. Valera Rozuvan 2012-12-26 14:52:22 +02:00
• 545b1bea24 Slight changes to UI design. Valera Rozuvan 2012-12-26 14:46:34 +02:00
• 3048853749 Added ability to communicate with server via input element. Work in progress. Part 8. Valera Rozuvan 2012-12-26 09:45:15 +02:00
• c34fbbe19f Added support for individual targets. Work in progress. Part 7. Valera Rozuvan 2012-12-26 07:52:28 +02:00
• e842415194 Added ability to define targets on the target container. Work in progress. Part 6. Valera Rozuvan 2012-12-25 16:06:08 +02:00
• 06f1c54fa7 Fix. Now the z index stack is consistent. Valera Rozuvan 2012-12-25 13:26:34 +02:00
• f0850f4c4b Updated JS to use latest JSON def. Valera Rozuvan 2012-12-25 13:02:08 +02:00
• b1a73a5293 Client side drag and drop. Work in progress. Part 5. Valera Rozuvan 2012-12-25 12:51:56 +02:00
• 57bec4083e updated inpyttype to new req Alexander Kryklia 2012-12-25 12:21:03 +02:00
• 4594986b38 Client side drag and drop. Work in progress. Part 4. Valera Rozuvan 2012-12-25 11:10:26 +02:00
• de954a41be Changed back rakefile. Valera Rozuvan 2012-12-25 08:58:43 +02:00
• 06fd823881 Client side drag and drop. Work in progress. Part 3. Valera Rozuvan 2012-12-25 08:55:13 +02:00
• f659247739 Client-side Drag and Drop: work in progress. Part 2. Valera Rozuvan 2012-12-24 16:24:25 +02:00
• 8d69049746 Client-side Drag and Drop: work in progress. Part 1. Valera Rozuvan 2012-12-24 15:01:49 +02:00
• 95060f3930 updated python part to sync with new interface Alexander Kryklia 2012-12-24 14:39:52 +02:00
• 61c68b740c Set up of basic RequireJS skeleton structure. Valera Rozuvan 2012-12-24 10:41:07 +02:00
• 757f955c5e Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course. Valera Rozuvan 2012-12-24 10:01:38 +02:00
• 313055fe96 transfer images list to html Alexander Kryklia 2012-12-21 18:17:27 +02:00
• ccb8e96acb fix Alexander Kryklia 2012-12-21 17:47:51 +02:00
• a394419641 updates Alexander Kryklia 2012-12-21 17:43:09 +02:00
• c7add85c9a added new tag Alexander Kryklia 2012-12-21 16:10:56 +02:00
• 0001a67ce1 update tag name Alexander Kryklia 2012-12-21 12:54:47 +02:00
• cc78ebe329 rename tag Alexander Kryklia 2012-12-21 12:43:58 +02:00
• ea3b1f93b0 updated drag and drop files Alexander Kryklia 2012-12-21 12:24:54 +02:00
• 5200534a4a template for drag_and_drop capaproblem Alexander Kryklia 2012-12-21 11:24:38 +02:00
• b26c59bda0 fix syntax error Kevin Chugh 2013-01-20 01:53:25 -05:00
• 6da9c7bd9a get (openId) provider_login to work with POST requests Brian Wilson 2013-01-18 18:37:24 -05:00
• 9790881af3 Merge pull request #1319 from MITx/bug/remove_extra_require_js Carlos Andrés Rocha 2013-01-18 14:07:07 -08:00
• 0f035b7692 Remove extra RequireJS.js entry. David Ormsbee 2013-01-18 17:03:55 -05:00
• 84fa4a0192 Merge pull request #1318 from MITx/hotfix/rocha/javascript-error-in-sequence-display David Ormsbee 2013-01-18 14:02:27 -08:00
• 84efafc896 Add missing semicolon at the end of sequence display module javascript Carlos Andrés Rocha 2013-01-18 17:00:51 -05:00
• c7421f040b Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates Diana Huang 2013-01-18 16:45:36 -05:00
• ef53bab5dd One more fix Diana Huang 2013-01-18 16:41:00 -05:00
• 6ab7afac4a One more merge fix Diana Huang 2013-01-18 16:37:47 -05:00
• dd20226ec3 Merge branch 'master' into feature/diana/rubric-input Fix some merge issues involving rubric rendering Diana Huang 2013-01-18 16:36:22 -05:00
• 2767610ef6 Merge pull request #1317 from MITx/feature/cdodge/cms-master-merge4 chrisndodge 2013-01-18 13:28:02 -08:00
• 8cdc118a1d Typo fix Diana Huang 2013-01-18 16:26:47 -05:00
• e04f2f984a Update tests for new behavior Diana Huang 2013-01-18 16:18:33 -05:00
• 2291483c43 Merge branch 'master' into diana/open-ended-ui-updates Diana Huang 2013-01-18 16:16:21 -05:00
• 0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-18 16:14:27 -05:00
• 44e7d6b267 Merge pull request #1315 from MITx/diana/fix-sa-tests David Ormsbee 2013-01-18 13:07:33 -08:00
• 999a648c3f Merge branch 'master' into diana/fix-sa-tests Diana Huang 2013-01-18 15:49:03 -05:00
• 550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-18 15:44:41 -05:00
• 39101c76a5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-18 15:43:45 -05:00
• 878640b651 Merge pull request #1316 from MITx/bugfix/victor/beta_testers David Ormsbee 2013-01-18 12:43:11 -08:00
• 1411bd1a88 fix tests--nosetests is overly excited about my code Victor Shnayder 2013-01-18 15:39:28 -05:00
• 89055da8ba Take out useless logging. Diana Huang 2013-01-18 15:38:59 -05:00
• 0e3aeb4041 Merge branch 'master' into diana/fix-sa-tests Diana Huang 2013-01-18 15:21:50 -05:00