Commit Graph

  • 9dd9727bb8 Another minor tweak to limit these tests to the cms. Ashley Penney 2013-01-16 14:52:54 -05:00
  • 808c99335e Merge pull request #1290 from MITx/feature/christina/misc Don Mitchell 2013-01-16 11:42:37 -08:00
  • db366d4ebb Update CSS to make rubric even narrower. Diana Huang 2013-01-16 14:36:08 -05:00
  • e5bb0c8e59 Fix how we calculate max value. Diana Huang 2013-01-16 14:31:50 -05:00
  • 1d6b1be888 fix missing indirection in log message Brian Wilson 2013-01-16 14:30:30 -05:00
  • 60531e30fa Add progress bars to the staff grading and peer grading views. Diana Huang 2013-01-16 14:22:39 -05:00
  • baa0e9be01 Merge pull request #1291 from MITx/bugfix/apenney/jenkins Jay Zoldak 2013-01-16 11:13:37 -08:00
  • e38b44157a Lets explicitly make the virtualenvs for now. Ashley Penney 2013-01-16 14:09:48 -05:00
  • d4f79c0498 Fix bug related to img link for non-img files. https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet cahrens 2013-01-16 13:51:17 -05:00
  • cc5a5e2996 Fix multiple choice checkbox. #117 cahrens 2013-01-16 12:52:05 -05:00
  • aec40ead57 Use tables to display problems instead of a simple list Diana Huang 2013-01-16 12:40:39 -05:00
  • aa5ede3f92 Merge pull request #1289 from MITx/bugfix/dave/dont_explode_askbot_migration Ashley Penney 2013-01-16 09:18:12 -08:00
  • ebca3af789 Merge pull request #1286 from MITx/feature/christina/misc chrisndodge 2013-01-16 09:17:13 -08:00
  • 5d66490065 Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user David Ormsbee 2013-01-16 12:15:23 -05:00
  • de2674e3df Minor cleanup. cahrens 2013-01-16 11:38:18 -05:00
  • 29c5d00b68 Merge pull request #1246 from MITx/feature/brian/pearson-reg brianhw 2013-01-16 08:27:19 -08:00
  • bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg Brian Wilson 2013-01-16 11:24:46 -05:00
  • cc1b50ee4a use new-style class for TestCenterExam Brian Wilson 2013-01-16 11:24:20 -05:00
  • 65d45d6dee Minor cleanup. cahrens 2013-01-16 09:57:21 -05:00
  • 07d6bee5a7 storing work cahrens 2013-01-16 09:53:28 -05:00
  • 9519087d84 Merge pull request #1271 from MITx/feature/victor/beta-testers Victor Shnayder 2013-01-16 06:50:57 -08:00
  • 8b3fb33fe3 Update tests to handle rubric scores Diana Huang 2013-01-16 09:47:54 -05:00
  • d844730f71 Fix some sizing issues in the CSS. Diana Huang 2013-01-16 09:17:00 -05:00
  • 9b2faa4987 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-16 09:02:51 -05:00
  • b188c8e722 fix bug in string splitting. Victor Shnayder 2013-01-15 18:19:54 -05:00
  • cc31c79517 fixes for first round of code review Brian Wilson 2013-01-15 18:15:54 -05:00
  • 3b28e328c4 disable export of testcenter_exam from course module (and add test). Brian Wilson 2013-01-15 17:54:10 -05:00
  • 8ff77329b1 Fix rubric rendering in combined open ended peer grading Vik Paruchuri 2013-01-15 16:22:27 -05:00
  • 39655bff68 Merge pull request #1283 from MITx/content/rocha/faq-update David Ormsbee 2013-01-15 13:16:35 -08:00
  • 9818664bb1 storing work cahrens 2013-01-15 16:04:34 -05:00
  • cd2a704aec Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg Brian Wilson 2013-01-15 16:04:05 -05:00
  • ef0f973ca4 display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands. Brian Wilson 2013-01-15 16:00:10 -05:00
  • 78c194aaf4 Merge pull request #1284 from MITx/feature/vik/add-staff-grading-notifications Diana Huang 2013-01-15 12:45:56 -08:00
  • fb251cacbe Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg Brian Wilson 2013-01-15 15:42:29 -05:00
  • 32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations Brian Wilson 2013-01-15 15:42:09 -05:00
  • 8aa033f601 Add peer and staff grading required display, notifications Vik Paruchuri 2013-01-15 15:40:23 -05:00
  • 3ff3189260 Finished tests for access.py (as far as able) Deena Wang 2013-01-15 15:39:05 -05:00
  • ef2b069409 Add staff grading notifications Vik Paruchuri 2013-01-15 15:34:09 -05:00
  • 540232f54d revised minor syntax/line indents on faq scss and js Brian Talbot 2013-01-15 14:31:11 -05:00
  • a4e53d7a7f pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately Brian Talbot 2013-01-15 14:52:39 -05:00
  • 77fe6ed452 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-15 14:48:40 -05:00
  • 4422bd996d Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-15 14:44:57 -05:00
  • 9c7f2cf604 WIP -- do not merge Victor Shnayder 2013-01-15 14:44:09 -05:00
  • e2f8ce9de6 Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications VikParuchuri 2013-01-15 11:40:59 -08:00
  • 301293f8b0 Remove debug statement, fix active page issue on problem page Vik Paruchuri 2013-01-15 14:33:38 -05:00
  • 7b1262f667 Fix up authentication, other things Vik Paruchuri 2013-01-15 14:31:02 -05:00
  • ed6134ea11 abstracted out common editor styles shared by problem and html editors Brian Talbot 2013-01-15 14:14:31 -05:00
  • ad526e624a Use the correct variable. Diana Huang 2013-01-15 14:10:45 -05:00
  • 9a81c56254 Tracking progess page lookups on instructor dashboard John Hess 2013-01-15 13:39:14 -05:00
  • 9ef1a4ded5 Tracking problem resets, clearer msgs John Hess 2013-01-15 13:27:44 -05:00
  • d025ca248f Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page John Hess 2013-01-14 20:42:07 -05:00
  • 3d2ae66cf5 Refactor out rubric rendering and pass along the right information for peer grading Diana Huang 2013-01-15 13:46:18 -05:00
  • c8f52deb3d wire up registration closed functionality Brian Wilson 2013-01-15 11:55:36 -05:00
  • 8a1f30bfa0 Merge pull request #1281 from MITx/fix/apenney/numpy Carlos Andrés Rocha 2013-01-15 08:46:06 -08:00
  • 0461407857 Proposed changes to fix asset caching bug. cahrens 2013-01-15 11:45:08 -05:00
  • 02d5cfd14d add comment about time format conversion Victor Shnayder 2013-01-15 11:36:12 -05:00
  • 2f7210ed0c address Ike's comments Victor Shnayder 2013-01-14 11:35:12 -05:00
  • 570df1c9e6 Fix bugs, refactor, support lists of users Victor Shnayder 2013-01-14 10:27:14 -05:00
  • 3f654af7cd Refactor common code, fix view a bit Victor Shnayder 2013-01-14 09:22:57 -05:00
  • 1a5fc065ad Add beta test group management view to instructor dashboard Victor Shnayder 2013-01-14 08:08:31 -05:00
  • 093839e13d flesh out comment. Ashley Penney 2013-01-15 11:39:59 -05:00
  • d4259c63db Merge pull request #1260 from MITx/cale/circular-import-fix David Ormsbee 2013-01-15 08:37:21 -08:00
  • 58a9fdeddc add note about settings needed for manual testing Victor Shnayder 2013-01-12 10:10:01 -05:00
  • 3e5a2f9bde Add beta test group support Victor Shnayder 2013-01-12 09:48:44 -05:00
  • 66ffef131d Merge branch 'master' into cale/circular-import-fix David Ormsbee 2013-01-15 11:35:19 -05:00
  • 244584ce6c DnD for subsections and units (no auto open) Don Mitchell 2013-01-15 11:33:11 -05:00
  • a2d5d0bc89 Merge pull request #1279 from MITx/jaakana David Ormsbee 2013-01-15 08:25:14 -08:00
  • 36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx David Ormsbee 2013-01-15 08:24:09 -08:00
  • ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3 David Ormsbee 2013-01-15 08:22:19 -08:00
  • 48be0b15a1 Clean up on staff grading code path and the beginnings of peer grading. Diana Huang 2013-01-15 11:21:10 -05:00
  • c50c705eb6 Temporary workaround to our bizarre numpy issue. I think it's to do with the way shiningpanda works but I can't see any reason why. Ashley Penney 2013-01-15 11:17:45 -05:00
  • e8bcc1729a Merge branch 'feature/cale/cms-master' into feature/dhm/drag Don Mitchell 2013-01-15 11:00:41 -05:00
  • 3a2c57524f Basic dnd for units Don Mitchell 2013-01-15 10:35:20 -05:00
  • 623769e9d8 separated common editor UI from problem and HTML editor SCSS - wip Brian Talbot 2013-01-15 09:57:48 -05:00
  • 9d4119b2a8 Merge pull request #1278 from MITx/vik/modify-rubric-input Diana Huang 2013-01-15 05:56:27 -08:00
  • e070a926c5 pearson registration - resolving merge conflict Brian Talbot 2013-01-15 07:46:49 -05:00
  • b53786b688 removed on event from slider and readonly from textbox Alexander Kryklia 2013-01-15 13:34:16 +02:00
  • 00bf973d4a Renamed to XML example code. Valera Rozuvan 2013-01-15 12:46:52 +02:00
  • 442e112d6f Updated documentation. Try #2. Valera Rozuvan 2013-01-15 12:45:07 +02:00
  • c9c328cf39 Bugfix. Valera Rozuvan 2013-01-11 16:18:43 +02:00
  • d3045b36ab initial function call added, fix Alexander Kryklia 2013-01-11 16:13:16 +02:00
  • fc09bbd0b4 added funciton call Alexander Kryklia 2013-01-11 16:11:13 +02:00
  • a49f94fe49 added none to allowed parameters in functions Alexander Kryklia 2013-01-11 16:08:27 +02:00
  • b56174c8d4 updated docs Alexander Kryklia 2013-01-11 16:01:29 +02:00
  • ec0bdfb445 New feature: can specify output of "none" for a dynamic element. Valera Rozuvan 2013-01-11 15:59:54 +02:00
  • 1770de73f1 Bugfixing. Refactoring. Removed readonly check for text edits. Styling of text edits with jQuery UI. Valera Rozuvan 2013-01-11 15:54:19 +02:00
  • 77962e3cdb Removed unnecessary comments. Added feature to update element either on "change" or on "slide" event. Valera Rozuvan 2013-01-11 15:35:48 +02:00
  • 052dc3fa22 New feature: For bar graphs, can specify bar width and bar alignment. Valera Rozuvan 2013-01-11 14:39:50 +02:00
  • 271c182f4e Fixed bug: jQuery slider default change event name is "slidechange", and it behaves a bit differently than "slide" event. Valera Rozuvan 2013-01-11 11:47:20 +02:00
  • a75003ef2f added no_slide parameters Alexander Kryklia 2013-01-11 11:23:25 +02:00
  • 782fb3b465 New feature: Can specify "change" or "slide" event type of sliders. Valera Rozuvan 2013-01-11 11:02:58 +02:00
  • f17e2466b1 New feature: Now can specify x-axis and y-axisnames for ticks. Updated "Fick s Second Law" demo to demonstrate this. Valera Rozuvan 2013-01-11 10:32:21 +02:00
  • efa375114e Enabled automatic addition of "return" statement for asymptotes, xrange.min, and xrange.max. Valera Rozuvan 2013-01-10 16:52:30 +02:00
  • ad4f4144e8 New feature: Added ability to set "color" and "weight" property of moving label text. Valera Rozuvan 2013-01-10 15:49:05 +02:00
  • bd605150ad New feature: Dynamically moving labels added. "Sample size and power" demo updated. Valera Rozuvan 2013-01-10 14:58:24 +02:00
  • 1753f983ae Added ability to insert automatic "return" for dynamic element functions, and graph label dynamic element functions. Valera Rozuvan 2013-01-10 11:46:22 +02:00
  • 72d500c168 Feature "Dynamic Elements in Labels" has been refactored to provide the user an easier interface for access. Demo "Sample Size and Power" has been updated. Valera Rozuvan 2013-01-10 11:11:00 +02:00
  • 20227d219e Added new feature: ability to add a label for an asymptote. Added new demo to GST: "Power and Alpha Demo". Valera Rozuvan 2013-01-09 10:16:06 +02:00
  • def8eb472c Refactoring. Added ability to add dynamic element output to graph labels. Updated 2 demos for GST. "Falsified Clinic Data", and "Sample Size and Power". Valera Rozuvan 2013-01-08 17:17:29 +02:00
  • 9cabaf1ef3 Added automatic insertion of missing "return" statement into simple function strings. Added an option to turn this feature off. Valera Rozuvan 2013-01-04 17:26:48 +02:00