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

Commit Graph

  • 50eced5b32 Attempt to patch the dnd hesitation fixes onto master Don Mitchell 2013-02-04 11:34:59 -05:00
  • 8f3e8024b9 Merge branch 'master' into feature/cas/manual-policy cahrens 2013-02-04 10:54:22 -05:00
  • 8bd7b60aca Add in key to mock peer grading service Vik Paruchuri 2013-02-04 10:50:07 -05:00
  • 4b59e7d551 Fix max score check for the updated rubric UI stuff. Diana Huang 2013-02-04 10:34:00 -05:00
  • c991c0489c Fix open ended test with flagging Vik Paruchuri 2013-02-04 10:26:25 -05:00
  • c9dc762a2b studio - soft landing UI: how it works basic layout styling Brian Talbot 2013-02-04 09:54:14 -05:00
  • ecbe297936 studio - soft landing UI: how it works pathing, html and basic layout styling Brian Talbot 2013-02-04 09:39:36 -05:00
  • a6e0fb91ef Merge pull request #1406 from MITx/bug/bug152 Christina Roberts 2013-02-04 06:19:17 -08:00
  • f49b5ec771 Merge branch 'master' into diana/rubric-ui-improvements Diana Huang 2013-02-04 09:11:28 -05:00
  • d4481fa918 Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements Diana Huang 2013-02-04 09:07:19 -05:00
  • 69225f6435 cohort ID showing, have to translate to display text Kevin Chugh 2013-02-04 08:33:33 -05:00
  • 79e3482265 studio - soft landing UI: initial how it works plumbing Brian Talbot 2013-02-04 08:25:58 -05:00
  • e207881b50 studio - soft landing UI: button tweaks Brian Talbot 2013-02-04 08:21:32 -05:00
  • 1685f302ab add TimerModule to courseware Brian Wilson 2013-02-04 02:22:24 -05:00
  • 4946eace2a studio - soft landing UI: sign in and basic styling/layout tweaks Brian Talbot 2013-02-04 00:43:24 -05:00
  • 5a1795db85 studio - soft landing UI: basic signin/sign up styling and sign up markup/templating Brian Talbot 2013-02-04 00:19:26 -05:00
  • ddc8bf2b42 add instructor dashboard feature to download profile & problem state ichuang 2013-02-04 04:23:23 +00:00
  • 1144b0eeed studio - soft landing UI: initial header and templating work Brian Talbot 2013-02-03 22:22:11 -05:00
  • e59b0b87b1 add docs for conditional module; clean up a bit more ichuang 2013-02-03 21:07:23 -05:00
  • 4446ddb292 cleaned up conditional module a bit; add test for conditional module ichuang 2013-02-03 20:59:05 -05:00
  • 604bfcc04a studio - course nav - fixing width of course name for now Brian Talbot 2013-02-03 20:20:35 -05:00
  • 95ef12169a extend conditional module to add require_attempted ichuang 2013-02-03 18:52:44 -05:00
  • 1d29e1f2f4 comment out some debug in conditional_module; leave undeleted for future tests ichuang 2013-01-18 04:15:45 +00:00
  • 363ca7031e add coffeescript/js for conditional module, does XModule.loadModules ichuang 2013-01-18 03:43:31 +00:00
  • 19051e40d2 use ajax for doing conditional_module ichuang 2013-01-18 02:20:23 +00:00
  • 8db96abb18 conditional_module.html ichuang 2013-01-17 03:50:06 +00:00
  • 95b8134731 initial implementation of conditional_module; doesn't load dynamically yet ichuang 2013-01-17 03:40:24 +00:00
  • fcbd4bd1cd produce and consume group_id from dropdowns Kevin Chugh 2013-02-02 05:46:11 -05:00
  • 22444f6dfe studio - revised course nav: fixed placeholder login link text Brian Talbot 2013-02-01 20:50:29 -05:00
  • 83ad950887 studio - revised course nav: plumbed in current html and scss progress into header Brian Talbot 2013-02-01 20:48:59 -05:00
  • d0d0296310 studio - revising course-based navigation - initial scss setup Brian Talbot 2013-02-01 19:57:17 -05:00
  • 01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes VikParuchuri 2013-02-01 15:46:33 -08:00
  • d9517877a4 Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging Vik Paruchuri 2013-02-01 18:32:48 -05:00
  • 9310dcbe0d Remove reload test Vik Paruchuri 2013-02-01 18:31:50 -05:00
  • 9d98b7055d add course navigation back into timed exam. Add initial timer styling. Brian Wilson 2013-02-01 17:52:14 -05:00
  • 1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html Don Mitchell 2013-02-01 17:20:58 -05:00
  • 0ca7131974 Clicking on annotation span should scroll to the discussion widget. Arthur Barrett 2013-02-01 16:08:23 -05:00
  • 1a6fc1b505 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing Deena Wang 2013-02-01 16:05:44 -05:00
  • c144b2519a more tests in test_views.py Deena Wang 2013-02-01 15:57:11 -05:00
  • 9d34767e6a Fix the remaining module storage tests. Ned Batchelder 2013-02-01 15:45:43 -05:00
  • b609bbeeed Fix JS tests Vik Paruchuri 2013-02-01 15:36:05 -05:00
  • a85d43a817 Make rubrics spacing smaller and fix a bug in the grading service renderer Diana Huang 2013-02-01 14:34:09 -05:00
  • 71c233af15 Fix bug in the callback Diana Huang 2013-02-01 13:06:12 -05:00
  • 1c5c54c862 Make the rubric for self-assessment selectable and remove the separate grade selection. Diana Huang 2013-02-01 11:27:53 -05:00
  • 68fc794a97 Add in some better encouragement to write feedback Diana Huang 2013-02-01 11:21:56 -05:00
  • 745c052775 Remove duplicate Javascript and remove total grade selection. Diana Huang 2013-02-01 10:31:46 -05:00
  • ba30c2ce58 Calculate the total score from the rubric. Diana Huang 2013-02-01 10:17:16 -05:00
  • 0bae983982 Visual updates to rubric Diana Huang 2013-02-01 08:44:08 -05:00
  • 92b7dbdc69 Refactor rubric JS so that we don't have to keep duplicating this code. Diana Huang 2013-02-01 08:43:55 -05:00
  • 1fde3c5ec5 Make rubric cleaner and visually simpler Diana Huang 2013-01-31 14:23:17 -05:00
  • 7e345ce512 Add scores to the top of the rubric, remove from individual cells Diana Huang 2013-01-31 13:28:19 -05:00
  • 69d5c005c3 Refactor rubric CSS into a single file. Diana Huang 2013-01-31 13:27:46 -05:00
  • 00ffbc070a Make rubrics spacing smaller and fix a bug in the grading service renderer Diana Huang 2013-02-01 14:34:09 -05:00
  • 1c09d9cacb For prod environments only log info and up John Jarvis 2013-02-01 13:34:29 -05:00
  • 8f005a5a1f Moved discussion html into its own method, should probably be in a template. Arthur Barrett 2013-02-01 13:31:35 -05:00
  • f525b17b1a pep8 cleanup John Jarvis 2013-02-01 13:13:16 -05:00
  • 8b01298969 Removing duplicate loggers John Jarvis 2013-02-01 13:11:14 -05:00
  • 4a08bc7759 Adding service_variant and a little pep8 cleanup John Jarvis 2013-02-01 13:10:26 -05:00
  • 91d9bc05be Fix bug in the callback Diana Huang 2013-02-01 13:06:12 -05:00
  • 8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names Your Name 2013-02-01 13:01:54 -05:00
  • 2b764eebad Make the rubric for self-assessment selectable and remove the separate grade selection. Diana Huang 2013-02-01 11:27:53 -05:00
  • 1fef6b161b Add in some better encouragement to write feedback Diana Huang 2013-02-01 11:21:56 -05:00
  • 6b6d8a94d0 Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. Ned Batchelder 2013-02-01 10:50:01 -05:00
  • cb44918f49 Remove duplicate Javascript and remove total grade selection. Diana Huang 2013-02-01 10:31:46 -05:00
  • 25aca5866d Merge branch 'master' into feature/deena/testing Deena Wang 2013-02-01 10:19:40 -05:00
  • 0ec3be1815 Calculate the total score from the rubric. Diana Huang 2013-02-01 10:17:16 -05:00
  • 14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists Christina Roberts 2013-02-01 06:51:35 -08:00
  • dce65f2ab7 Merge pull request #1404 from MITx/feature/edz/service-variant Calen Pennington 2013-02-01 06:49:51 -08:00
  • 61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) Brian Talbot 2013-02-01 09:41:51 -05:00
  • c4b9288c6d Add comment describing why commented out code is there Vik Paruchuri 2013-02-01 09:32:29 -05:00
  • 78dda49764 Fix jasmine tests? Vik Paruchuri 2013-02-01 09:28:52 -05:00
  • f05bda7644 Visual updates to rubric Diana Huang 2013-02-01 08:44:08 -05:00
  • 6575386d69 Refactor rubric JS so that we don't have to keep duplicating this code. Diana Huang 2013-02-01 08:43:55 -05:00
  • 969737c58e service variant code for loading different config e0d 2013-01-31 21:43:35 -05:00
  • 5ac6439cc0 Xmodule working...need to work on some issues (rubric scores not passing properly), and also fix notifications Vik Paruchuri 2013-01-31 20:22:35 -05:00
  • d1c55208c1 Clean up response code Vik Paruchuri 2013-01-31 20:08:55 -05:00
  • c1583dbba2 Properly load javascript, fix templates to work with xmodule, modify AJAX handlers Vik Paruchuri 2013-01-31 19:57:35 -05:00
  • c2f644656d Fix HTML return Vik Paruchuri 2013-01-31 19:12:49 -05:00
  • d8b94f91bd Don't pass course to templates Vik Paruchuri 2013-01-31 18:53:17 -05:00
  • 4608bb274e Fix system passing issues Vik Paruchuri 2013-01-31 18:43:13 -05:00
  • 48bb447fbd Adding basic annotatable module and related files. Arthur Barrett 2013-01-31 18:42:11 -05:00
  • edce6edb99 Clean up peer grading service imports Vik Paruchuri 2013-01-31 18:38:55 -05:00
  • 4825ad7a15 Fix module imports Vik Paruchuri 2013-01-31 18:35:11 -05:00
  • 07638440ac rename testcenter_exam to timed_exam, and read duration from metadata (policy.json) Brian Wilson 2013-01-31 18:33:22 -05:00
  • 59ba308354 Add in peer grading entry point Vik Paruchuri 2013-01-31 18:28:15 -05:00
  • bdb82cda65 Strip out JS, old urls Vik Paruchuri 2013-01-31 18:23:30 -05:00
  • a89503431f Merge pull request #1403 from MITx/style/btalbot/lms-calendartables David Ormsbee 2013-01-31 15:17:38 -08:00
  • f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling Brian Talbot 2013-01-31 18:15:20 -05:00
  • 52f3e9daaf Start moving peer grading to xmodule Vik Paruchuri 2013-01-31 18:05:57 -05:00
  • da1660a043 fix get_cohorted_commentables Your Name 2013-01-31 17:34:37 -05:00
  • c5e80b9543 Fix open ended module tests Vik Paruchuri 2013-01-31 17:34:33 -05:00
  • f2f7459656 remove more prints Your Name 2013-01-31 17:24:08 -05:00
  • c25cd33214 remove print Your Name 2013-01-31 17:22:54 -05:00
  • d6f8def733 Move over rubric parsing logic to rubric module Vik Paruchuri 2013-01-31 17:18:32 -05:00
  • b22bad7fa1 Add in some removed imports (fix tests) Vik Paruchuri 2013-01-31 17:11:44 -05:00
  • 5eff483c76 Fix max score in combined xmodule tests Vik Paruchuri 2013-01-31 17:08:13 -05:00
  • 524047a11e Fix key error in open ended child Vik Paruchuri 2013-01-31 17:06:37 -05:00
  • 3fa67c1425 allow moderators and students to select cohort on post creation Your Name 2013-01-31 17:05:15 -05:00
  • 01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes Vik Paruchuri 2013-01-31 16:50:10 -05:00
  • 7908d87902 more tests for views.py Deena Wang 2013-01-31 15:58:14 -05:00