Commit Graph

  • 9d28c37724 add more test coverage for openid provider. Brian Wilson 2013-01-23 04:23:30 -05:00
  • ba62a657bf Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post Brian Wilson 2013-01-22 23:50:38 -05:00
  • 5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon Brian Talbot 2013-01-22 23:32:51 -05:00
  • ae6dd4965b Merge pull request #796 from MITx/feature/cale/cms-master David Ormsbee 2013-01-22 14:47:01 -08:00
  • 1f261e6556 Removed unused and stylistically incorrect class defs Don Mitchell 2013-01-22 17:34:45 -05:00
  • c2fcdfde3b RequireJS included 2x in main_vendor_js list Don Mitchell 2013-01-22 17:26:12 -05:00
  • 2ae92cbd88 Added RequireJS to fix expectation that it's included. Unit drag and drop works correctly now. Don Mitchell 2013-01-22 17:25:28 -05:00
  • 023dadd074 studio - resolved base variable missing issue on lms side Brian Talbot 2013-01-22 16:31:42 -05:00
  • fd3ae2c478 studio html editor - matched up styles for <pre> elements Brian Talbot 2013-01-22 16:16:30 -05:00
  • 731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce cahrens 2013-01-22 16:15:27 -05:00
  • b381881a02 studio html editor - adding in font references to tinyMCE css Brian Talbot 2013-01-22 16:05:06 -05:00
  • aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) Brian Talbot 2013-01-22 15:51:12 -05:00
  • 7b12dac021 added make visible to menu, and visibility description to threads marco 2013-01-22 15:47:23 -05:00
  • 13945994f0 change class on right element! cahrens 2013-01-22 15:47:09 -05:00
  • b554eb5afe Cleanup of format dropdown, toolbar buttons. cahrens 2013-01-22 15:28:47 -05:00
  • 532285e558 Only need one of these lines. Ned Batchelder 2013-01-22 15:22:30 -05:00
  • 85c3779286 Use the v0.1 tag in the XBlock repo. Ned Batchelder 2013-01-22 15:21:18 -05:00
  • e3a2749ff8 studio html editor - added in styles for TinyMCE table elements Brian Talbot 2013-01-22 15:20:25 -05:00
  • 26ee9a24ef Add test for TOC rendering Jay Zoldak 2013-01-22 13:42:01 -05:00
  • 7884e2c690 more tests Deena Wang 2013-01-22 15:08:44 -05:00
  • 75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master Calen Pennington 2013-01-22 14:47:52 -05:00
  • 82eee4af84 Merge pull request #1325 from MITx/feature/cale/anon-user-bugfix Calen Pennington 2013-01-22 11:11:07 -08:00
  • bbcab7314a Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed Calen Pennington 2013-01-22 14:10:01 -05:00
  • 3565023389 created test_courses.py Deena Wang 2013-01-22 14:01:01 -05:00
  • 24f23176af Add the ability to set up custom text for short form and and long form results. Diana Huang 2013-01-22 13:17:37 -05:00
  • 9520290018 add optional course_id parameter to DraftMongoStore.get_items() Chris Dodge 2013-01-22 11:55:36 -05:00
  • 6ce300a3c8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag Don Mitchell 2013-01-22 11:47:49 -05:00
  • 1b64faf610 Caching to change branches for other work Don Mitchell 2013-01-22 10:37:56 -05:00
  • 48fa4b4a5e Cache in order to try updated sortable lib Don Mitchell 2013-01-22 09:49:12 -05:00
  • edda80d485 New style base python classes and basestring type. Don Mitchell 2013-01-22 11:30:24 -05:00
  • 9a53c37530 Use something more visually easy to use for self-assessment. Diana Huang 2013-01-22 11:25:12 -05:00
  • 9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) Brian Wilson 2013-01-22 11:15:30 -05:00
  • 6e773909e4 added test_views Deena Wang 2013-01-22 10:36:05 -05:00
  • ba1cd8117f Rename 'Pending' column to something more descriptive Diana Huang 2013-01-22 10:33:07 -05:00
  • a34a9dd038 Merge branch 'master' into diana/open-ended-ui-updates Diana Huang 2013-01-22 08:40:40 -05:00
  • e7bc32fd4d Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-22 08:38:17 -05:00
  • 5d6c5de8e9 Merge pull request #1324 from MITx/pbaratta/symmath ichuang 2013-01-22 05:01:48 -08:00
  • 45f2a690d0 Commented on high level functions Peter Baratta 2013-01-17 06:51:57 -07:00
  • 26f7b984a7 Merge pull request #1323 from MITx/content/rocha/lewin-announcement Victor Shnayder 2013-01-21 14:19:54 -08:00
  • 183721ecf5 Correct last screenshot caption of media-kit page. Carlos Andrés Rocha 2013-01-21 13:59:05 -05:00
  • 899c501d3d Add announcement of Walter Lewin's course Carlos Andrés Rocha 2013-01-21 13:56:01 -05:00
  • 715a179015 Merge pull request #1321 from MITx/feature/alex/drag_and_drop-mitx Victor Shnayder 2013-01-21 09:36:11 -08:00
  • 91281915c4 update of deleted comment Alexander Kryklia 2013-01-21 19:28:49 +02:00
  • 00f966a94a populate -> __init__ Alexander Kryklia 2013-01-21 19:22:23 +02:00
  • a95e809824 documentation extended Alexander Kryklia 2013-01-21 19:05:30 +02:00
  • 2d67ee477e commend about rule in simple form Alexander Kryklia 2013-01-21 18:58:30 +02:00
  • 0f5e7cd9e4 explained for - else Alexander Kryklia 2013-01-21 18:55:29 +02:00
  • e78c020a52 removed dublicate comment Alexander Kryklia 2013-01-21 18:38:03 +02:00
  • 07c1085966 improved readability of drag and drop render test Alexander Kryklia 2013-01-21 18:33:17 +02:00
  • 3e0333309d removed openendedinput Alexander Kryklia 2013-01-21 18:03:04 +02:00
  • e273bb1259 Updated DOCS with sample XML for DnD. Valera Rozuvan 2013-01-21 15:47:59 +02:00
  • b25d4224b5 updated docs Alexander Kryklia 2013-01-21 15:42:41 +02:00
  • a4e8cb362d updated docs Alexander Kryklia 2013-01-21 14:10:17 +02:00
  • 47d1173394 Refactoring and cleaning of code. Valera Rozuvan 2013-01-18 18:44:50 +02:00
  • 3cc4a663ff Refactoring and cleaning of code. Valera Rozuvan 2013-01-18 18:32:27 +02:00
  • a228c163c7 added test for alternative answer notation Alexander Kryklia 2013-01-18 17:02:02 +02:00
  • 5457f35f81 Drag and Drop: Further testing of new feature "can reuse". Valera Rozuvan 2013-01-18 16:05:33 +02:00
  • 7ad6ef21f4 Removed unnecessary debug information. Valera Rozuvan 2013-01-18 13:30:41 +02:00
  • 1eec7bada7 Updated docs. Added debug output info for tracing problem related to server communications. Valera Rozuvan 2013-01-18 12:51:48 +02:00
  • 0f7b89facc Bug fixes for new functionality: Draggable "is reusable". Valera Rozuvan 2013-01-18 12:07:19 +02:00
  • 5001680356 Implemented isReusable feature. Not fully tested. Valera Rozuvan 2013-01-17 18:26:12 +02:00
  • 98977cabdb Refactoring of Drag and Drop complete. Draggable properties isUsable, isOriginal included, but functionality connected with them is not complete. Found and fixed bug with z-index ordering. Valera Rozuvan 2013-01-17 16:36:15 +02:00
  • f15887383e Refactoring. Valera Rozuvan 2013-01-16 18:08:40 +02:00
  • 35174dd36c resised picture Alexander Kryklia 2013-01-16 17:29:17 +02:00
  • 8b3a8a30ab Refactoring. Valera Rozuvan 2013-01-16 16:59:00 +02:00
  • d231b9ed04 update docs Alexander Kryklia 2013-01-16 16:54:52 +02:00
  • 4215f4f923 add and update tests Alexander Kryklia 2013-01-16 16:46:28 +02:00
  • de35d1e9e4 update docs Alexander Kryklia 2013-01-16 16:46:15 +02:00
  • 79f5e98dfc Drag and Drop: refactoring + preparing for reuse of draggables. Valera Rozuvan 2013-01-16 16:39:00 +02:00
  • e47f0e45f2 unorderly->unordered Alexander Kryklia 2013-01-16 16:22:46 +02:00
  • 099c79c881 update docs Alexander Kryklia 2013-01-16 16:21:40 +02:00
  • a6f87dcfdc updated docs Alexander Kryklia 2013-01-16 16:18:21 +02:00
  • e017297d3f fix Alexander Kryklia 2013-01-16 16:18:06 +02:00
  • c8bbcacfef labels reuse logic and tests Alexander Kryklia 2013-01-15 19:07:05 +02:00
  • ead346ee5f Refactoring. New feature: adding multiple draggables from one. Valera Rozuvan 2013-01-15 17:55:43 +02:00
  • e2bbaf08b9 removed use_targets flag Alexander Kryklia 2013-01-15 16:31:45 +02:00
  • 0349e157b5 renamed graders to verifiers Alexander Kryklia 2013-01-15 15:52:14 +02:00
  • 63b79f76d7 added can_reuse Alexander Kryklia 2013-01-15 13:31:16 +02:00
  • 22014f7f58 New feature: Clicking on number for multiple icons on target will cycle all icons on target. Fixed bug with z-order ordering. Valera Rozuvan 2013-01-09 18:07:44 +02:00
  • f157702548 fix Alexander Kryklia 2013-01-09 14:06:23 +02:00
  • c2dec3fb9d label bg color Alexander Kryklia 2013-01-09 14:03:03 +02:00
  • 6d7cfe08df Slight UI modification. Valera Rozuvan 2013-01-09 13:57:00 +02:00
  • 15ffc1f64f New feature: added ability to define custom label background color. Upated demo to use this feature. Needs to be turned on Python side. Valera Rozuvan 2013-01-09 12:04:09 +02:00
  • f92c0bdceb New feature: when the draggable is out of the slider container, if it has a label, the label will get a background. This way it is much easier to discern the label against the base image. Valera Rozuvan 2013-01-09 11:34:03 +02:00
  • 65fd71d06b added documentation for rules Alexander Kryklia 2013-01-04 15:43:26 +02:00
  • cd6e220ead Fixed annoying bug whre if you dragged any part of the base image or other parts of the Drag and Drop problem, then the browser would start highlighting the elements. Valera Rozuvan 2013-01-04 15:20:41 +02:00
  • b540ca492a removed old flag use_targets Alexander Kryklia 2013-01-04 15:13:51 +02:00
  • b7b25369e0 Added mouse event handlers to container of draggable. Now it is easier to initiate a dragging operation. Valera Rozuvan 2013-01-04 15:10:26 +02:00
  • 5c58881222 tests for drag and drop Alexander Kryklia 2013-01-04 14:48:55 +02:00
  • 01e4bdb831 added test for populate Alexander Kryklia 2013-01-04 14:11:04 +02:00
  • e66e4040b1 replaced ordereddict with dict Alexander Kryklia 2013-01-04 14:10:50 +02:00
  • 87c58be742 removed course folder var from mako template Alexander Kryklia 2013-01-04 13:31:54 +02:00
  • 933f94a514 comment fix Alexander Kryklia 2013-01-04 13:17:23 +02:00
  • 4c23860e0f updated inputtype test without course_id ransferring Alexander Kryklia 2013-01-04 13:15:26 +02:00
  • f02621876d removed course id Alexander Kryklia 2013-01-04 13:13:05 +02:00
  • d531746236 Removed reliance on imageDir config setting. Now we expect the correct path to tbe set in XML. Valera Rozuvan 2013-01-04 13:05:28 +02:00
  • 533a1693b3 Updated XML example in docs for Drag and Drop. Valera Rozuvan 2013-01-04 11:57:07 +02:00
  • a9e7890d6b Added correct handling of invalid (missing) base images. Now error is reported, and the damage is reduced to a minimum. Valera Rozuvan 2013-01-04 11:35:22 +02:00
  • 9817253850 Fixed problem with smaller and larger base images. Refactoring. Cleaning of code. Valera Rozuvan 2013-01-04 11:13:54 +02:00
  • ad0a7d308c tests and test plan Alexander Kryklia 2013-01-04 11:04:17 +02:00