Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 4d8165b2b6 Remove bad import of replace_urls Calen Pennington 2013-02-04 15:08:30 -05:00
  • 0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else Calen Pennington 2013-02-04 14:20:21 -05:00
  • 90107fa88f Import cache function correctly Calen Pennington 2013-02-04 13:56:50 -05:00
  • 10f8dbfa46 Handle options passed to clear_collectstatic_cache Calen Pennington 2013-02-04 13:52:52 -05:00
  • 2551243dfa Install the static_replace app for the management command Calen Pennington 2013-02-04 13:50:12 -05:00
  • ae5d3cbc57 Add admin command to flush the staticfiles cache Calen Pennington 2013-02-04 13:46:17 -05:00
  • 8592db92bf Add more tests of static_replace Calen Pennington 2013-02-04 13:19:23 -05:00
  • 5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps Calen Pennington 2013-02-04 13:12:44 -05:00
  • f1f2bd8fd2 Start adding tests for static replacement Calen Pennington 2013-02-04 12:29:35 -05:00
  • 401f564e6a Fix data directory passed to replace_static_urls Calen Pennington 2013-02-04 12:29:21 -05:00
  • ba7bd9022b Replace the correct /course/ urls, rather than /courses/ Calen Pennington 2013-02-04 11:24:11 -05:00
  • 0da1467a90 Pull out missing variable Calen Pennington 2013-02-04 11:20:43 -05:00
  • 88fc2e3756 Fix unbalanced paren in regex Calen Pennington 2013-02-04 11:17:25 -05:00
  • 04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible Calen Pennington 2013-02-01 22:15:31 -05:00
  • b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" Calen Pennington 2013-01-31 12:53:49 -05:00
  • e8a690df5e Update peer grading tests Vik Paruchuri 2013-02-05 10:46:00 -05:00
  • 82b2dc7193 Merge pull request #1427 from MITx/feature/christina/misc2 Don Mitchell 2013-02-05 07:19:40 -08:00
  • 286616e659 Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. https://edx.lighthouseapp.com/projects/102637/tickets/153 cahrens 2013-02-05 09:50:34 -05:00
  • f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements Diana Huang 2013-02-05 09:13:14 -05:00
  • 4bb4c458a8 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-05 09:12:08 -05:00
  • ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass David Ormsbee 2013-02-05 05:59:59 -08:00
  • 818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) David Ormsbee 2013-02-05 08:58:59 -05:00
  • 2ab3d1b167 Merge pull request #1425 from MITx/feature/ichuang/conditional-module-text-improvement Victor Shnayder 2013-02-04 18:54:56 -08:00
  • b654ee4006 studio - soft landing: further styling and modal set-up - WIP Brian Talbot 2013-02-04 20:25:58 -05:00
  • 837f54c055 inline cohorting almost done Your Name 2013-02-04 20:10:08 -05:00
  • 8ff3dde605 for require_attempted display "attempted" instead of "completed" ichuang 2013-02-04 19:54:36 -05:00
  • 630607d345 fix forum management commands (assign_default_role moved); add reload_forum_users ichuang 2013-02-05 00:21:04 +00:00
  • 6b8edde601 removed un-enroll all button for fear of disaster John Hess 2013-02-04 19:13:01 -05:00
  • 3136d2b4c1 Fixed target used for span event. Arthur Barrett 2013-02-04 18:53:37 -05:00
  • 443c3eda4f Tests for peer grading service may be fixed. Vik Paruchuri 2013-02-04 18:37:28 -05:00
  • 82afc477fa Merge pull request #1396 from MITx/feature/victor/randomization Victor Shnayder 2013-02-04 15:37:07 -08:00
  • 18814196f0 Make things slightly robust Vik Paruchuri 2013-02-04 18:31:32 -05:00
  • b6614f6939 add initial test that only tests the descriptor Victor Shnayder 2013-02-04 18:28:22 -05:00
  • 725f0c632c Remove get statements, fix module_render Vik Paruchuri 2013-02-04 18:27:25 -05:00
  • 435fd05ef4 Refactored the coffeescript behavior so it is a bit more testable. Arthur Barrett 2013-02-04 18:25:09 -05:00
  • 009a8c5f63 Fix issue with passing rubric scores back to controller Vik Paruchuri 2013-02-04 18:17:23 -05:00
  • fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass David Ormsbee 2013-02-04 15:04:03 -08:00
  • aeaad6f58d Force it to do expanded mode, because it's still generating compressed CSS output David Ormsbee 2013-02-04 18:03:05 -05:00
  • bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule Vik Paruchuri 2013-02-04 17:55:55 -05:00
  • fb777de18d Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging Diana Huang 2013-02-04 14:45:59 -08:00
  • 1dab4aba96 Fix accidental commit of dev.py Vik Paruchuri 2013-02-04 17:44:09 -05:00
  • e8803985f2 Fix JS on after event handling Vik Paruchuri 2013-02-04 17:41:44 -05:00
  • 4999a8e95f Merge pull request #1419 from MITx/debug/dave/sass David Ormsbee 2013-02-04 14:36:31 -08:00
  • 9f634aba3c Remove compressed flag from SASS call in pipeline so we can diff the generated CSS David Ormsbee 2013-02-04 17:33:26 -05:00
  • d89ab000d2 Fix a function call Vik Paruchuri 2013-02-04 17:30:45 -05:00
  • f019225d16 Fix reloading Vik Paruchuri 2013-02-04 17:23:34 -05:00
  • eb049bda9e Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging Vik Paruchuri 2013-02-04 17:18:59 -05:00
  • db21156d40 studio - soft landing: added in hover/active states for elements Brian Talbot 2013-02-04 17:18:12 -05:00
  • 7f96fbb3d1 Address review comments Vik Paruchuri 2013-02-04 17:15:07 -05:00
  • d7570de5d7 Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display Victor Shnayder 2013-02-04 14:14:18 -08:00
  • 0c07f03d68 XModule.loadModules only takes @el as argument now ichuang 2013-02-04 17:04:39 -05:00
  • 5d8aade8e7 Explain django settings imports Vik Paruchuri 2013-02-04 16:57:09 -05:00
  • c4c674367f Remove unneccesary imports Vik Paruchuri 2013-02-04 16:54:36 -05:00
  • 83b7533a12 Fix CSS to fit all elements on the page Vik Paruchuri 2013-02-04 16:49:32 -05:00
  • cbd0895aad Add in single peer grading problem view Vik Paruchuri 2013-02-04 16:42:14 -05:00
  • a8a9975914 Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes Your Name 2013-02-04 16:40:22 -05:00
  • 6e8e74aaf5 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes Your Name 2013-02-04 16:32:04 -05:00
  • f7ba14ae5e move group logic to get_threads Kevin Chugh 2013-02-04 16:31:28 -05:00
  • c9f75f8b3c Add in score return Vik Paruchuri 2013-02-04 16:14:34 -05:00
  • d6984cced8 Updated code to handle new analytics result format. jmvt 2013-02-04 16:08:37 -05:00
  • b6ae62e303 pearson - checking in files Brian W. worked on to resolve weird git issue locally Brian Talbot 2013-02-04 16:02:28 -05:00
  • 2306e7c1e8 Merge pull request #1417 from MITx/feature/christina/misc2 Christina Roberts 2013-02-04 12:56:26 -08:00
  • 43c2acdb1f Merge pull request #1416 from MITx/feature/dhm/dnd Christina Roberts 2013-02-04 12:50:36 -08:00
  • aac179f135 Try, try again. cahrens 2013-02-04 15:48:05 -05:00
  • 1923ae0d6b pearson - added in timer styling for IE7 Brian Talbot 2013-02-04 15:40:01 -05:00
  • 25bede9005 Merge pull request #1414 from MITx/feature/victor/showanswer-past-due Sarina 2013-02-04 12:39:13 -08:00
  • 07f87d4729 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy Don Mitchell 2013-02-04 15:34:19 -05:00
  • f48af8b80c Server side controller and model stubbed in. Now to wire to view. Don Mitchell 2013-02-04 15:34:05 -05:00
  • f8b7d5fad6 have timer redirect when it expires Brian Wilson 2013-02-04 15:13:14 -05:00
  • fe42d8e9a8 fix typo, add comment Victor Shnayder 2013-02-04 15:04:20 -05:00
  • af6123a1ac Add in methods to query data from the controller for student grading Vik Paruchuri 2013-02-04 15:00:07 -05:00
  • 4c5e59e84a Start to fix up instance states Vik Paruchuri 2013-02-04 14:52:41 -05:00
  • 3009acbb10 showing group names Kevin Chugh 2013-02-04 14:50:53 -05:00
  • ffd585ae56 studio - resolved safari/webkit display issue with unit editing window's wrapper background color Brian Talbot 2013-02-04 14:44:17 -05:00
  • 6ca55b8458 studio - overview drag and drop: removed unused scss and hid new unit button while dragging Brian Talbot 2013-02-04 14:35:04 -05:00
  • ed282c05d4 Proper handling of submissions Vik Paruchuri 2013-02-04 14:33:46 -05:00
  • 7860e013ad Fix unit tests to handle new max score requirements. Diana Huang 2013-02-04 14:25:23 -05:00
  • 71ae45fd0e studio - soft landing UI: how it works styling - wip Brian Talbot 2013-02-04 14:23:44 -05:00
  • 6cf2742e32 Trim unneeded files Vik Paruchuri 2013-02-04 14:22:57 -05:00
  • 7a3798f26f Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes Your Name 2013-02-04 14:17:02 -05:00
  • 81b86bb8fe Retrack dev Vik Paruchuri 2013-02-04 14:16:26 -05:00
  • 43ddf1fbcf Proper redirect behavior Vik Paruchuri 2013-02-04 14:14:15 -05:00
  • d1e819cb69 merged cahrens 2013-02-04 14:12:52 -05:00
  • 14676d1c32 Untrack dev.py, add in redirect code for peer grading Vik Paruchuri 2013-02-04 14:05:02 -05:00
  • 85abc43515 Add in the ability to handle due dates and grace periods Diana Huang 2013-02-04 14:02:42 -05:00
  • 3380745692 About to trim some lines Vik Paruchuri 2013-02-04 13:54:27 -05:00
  • 517f756ffa Merge pull request #1413 from MITx/feature/christina/misc2 Christina Roberts 2013-02-04 10:34:37 -08:00
  • 39479d9e18 See if this helps with the tab-changing race condition. cahrens 2013-02-04 13:28:34 -05:00
  • c6c89e4216 Make peer grading xmodule work with notifications Vik Paruchuri 2013-02-04 13:16:05 -05:00
  • ca2a375c17 saving work cahrens 2013-02-04 12:50:16 -05:00
  • 97a32f8ced Remove extra styling. Diana Huang 2013-02-04 12:45:40 -05:00
  • 7263cbfcca Fixes to make peer grading show up in notifications Vik Paruchuri 2013-02-04 12:41:14 -05:00
  • bdfc9d9784 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes Your Name 2013-02-04 12:30:48 -05:00
  • be5dd6d25a Merge pull request #1411 from MITx/feature/dhm/dnd Christina Roberts 2013-02-04 09:29:07 -08:00
  • 486e747b18 Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2 Victor Shnayder 2013-02-04 09:20:07 -08:00
  • f742b7d865 Start to integrate peer grading xmodule back into notifications Vik Paruchuri 2013-02-04 12:07:03 -05:00
  • 723f47f4cc Merge pull request #1412 from MITx/feature/jarv/service-variant-default jarv 2013-02-04 09:06:24 -08:00
  • 902cdefefa Added comments for unused 2nd arg on generateCheckHoverState Don Mitchell 2013-02-04 12:05:49 -05:00
  • 7c39e38539 Defaulting service_variant to a blank string John Jarvis 2013-02-04 12:05:45 -05:00
  • f9cca8befd Starting a framework for handling the closure of an open ended problem. Currently incomplete. Diana Huang 2013-02-04 11:51:05 -05:00