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

Commit Graph

  • bd47b0c79a New urls and corresponding views in the grading service Diana Huang 2013-01-03 12:59:34 -05:00
  • 0743adb1cd update grade download csv content Chris Dodge 2013-01-03 12:58:59 -05:00
  • ecd2304cc9 Merge pull request #1223 from MITx/fix/zoldak/lms-acceptance-testing Calen Pennington 2013-01-03 09:51:21 -08:00
  • e09a8e4a9b Don't show markdown if it doesn't exist. cahrens 2013-01-03 12:50:38 -05:00
  • fd902165c0 Add splinter to test-requirements.txt Jay Zoldak 2013-01-03 12:34:54 -05:00
  • 1c886b33cd Get buttons working again (with old behavior). cahrens 2013-01-03 12:24:17 -05:00
  • 8874d9d7f8 Add a draft implementation of the Poll module for Justice Calen Pennington 2013-01-03 12:21:13 -05:00
  • 90d902d105 Fix file version Vik Paruchuri 2013-01-03 12:11:27 -05:00
  • 1af35582fd Merge branch 'master' into vik/modify_open_ended Vik Paruchuri 2013-01-03 12:08:51 -05:00
  • 2daddff2ef Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing David Ormsbee 2013-01-03 09:06:47 -08:00
  • b5b11c696a Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into feature/cas/speed-editor Don Mitchell 2013-01-03 12:03:40 -05:00
  • 47ca316d25 populate markdown into problem editor template Don Mitchell 2013-01-03 12:02:45 -05:00
  • b01666f6d6 Fix error messages Vik Paruchuri 2013-01-03 11:23:20 -05:00
  • 5567477c67 Pass through initial display and answer Vik Paruchuri 2013-01-03 11:19:25 -05:00
  • 0c3eb67d5c More descriptive error message Vik Paruchuri 2013-01-03 11:15:00 -05:00
  • cce6b70103 Fixes to log entire state on errors, format feedback better Vik Paruchuri 2013-01-03 11:11:45 -05:00
  • 68f0f7e0a8 Handle unicode feedback Vik Paruchuri 2013-01-03 10:54:47 -05:00
  • a4eb76017b Display max score as well as score Vik Paruchuri 2013-01-03 09:51:04 -05:00
  • 9559c7b426 Patch "correct" answer display Vik Paruchuri 2013-01-03 09:41:46 -05:00
  • 37af39ef8d Change names Vik Paruchuri 2013-01-02 12:19:24 -05:00
  • 5caa42fbe3 Reset some files Vik Paruchuri 2012-12-14 17:39:56 -05:00
  • 11c330bf52 Fix rebase issues Vik Paruchuri 2012-12-14 17:33:54 -05:00
  • 439addc130 resolving further Sass conflicts within unit editing view styling Brian Talbot 2013-01-03 11:49:58 -05:00
  • 2c469cad75 Wire in submit message Vik Paruchuri 2012-12-12 12:58:29 -05:00
  • 1ac75b9420 Add in message passing pipeline Vik Paruchuri 2012-12-12 12:46:07 -05:00
  • 86247139a9 Merge pull request #1129 from MITx/valera/require-js David Ormsbee 2013-01-03 08:44:30 -08:00
  • 7b75703556 resolving Sass issues caused by previous merge conflict resolution in branch Brian Talbot 2013-01-03 11:44:09 -05:00
  • 09ed3d12a2 Hook up the backend into the new feedback response for scores Diana Huang 2012-12-14 12:00:42 -05:00
  • c87d0f11d6 Show error when no score selected Diana Huang 2012-12-14 10:48:22 -05:00
  • de7d6f184a Parse out the score given into an int. Diana Huang 2012-12-14 09:59:59 -05:00
  • 8f4efb0456 Hook up new radio buttons to the Javascript Diana Huang 2012-12-14 09:47:40 -05:00
  • 69ae1cc268 Clean up the styling and make the evaluation parts collapsible. Diana Huang 2012-12-13 17:01:21 -05:00
  • 54c541de45 Fix up the feedback-on-feedback styling and add radio button score selection. Diana Huang 2012-12-13 15:28:04 -05:00
  • fa97187a31 Patch naming issue Vik Paruchuri 2012-12-12 14:10:00 -05:00
  • ad41558379 Hide submit button Vik Paruchuri 2012-12-12 13:30:20 -05:00
  • b06ce84afd Wire in submit message Vik Paruchuri 2012-12-12 12:58:29 -05:00
  • b71233fd50 Add in message passing pipeline Vik Paruchuri 2012-12-12 12:46:07 -05:00
  • ce3b84d0e5 Message passing in lms Vik Paruchuri 2012-12-12 11:55:03 -05:00
  • b782f712b9 Add in more js to handle student feedback Vik Paruchuri 2012-12-12 11:42:24 -05:00
  • 634b586085 Integrate new ajax action Vik Paruchuri 2012-12-12 10:44:17 -05:00
  • d663d23257 Work on adding in a new ajax post type Vik Paruchuri 2012-12-12 10:33:36 -05:00
  • 8c4edc459c update testing doc Jay Zoldak 2013-01-03 11:22:21 -05:00
  • 68def8af5b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-03 11:21:35 -05:00
  • e60230dd5a More deletion cahrens 2013-01-03 11:21:01 -05:00
  • 4e9d5c8a6a Placeholders for markdown editor js and reference to pull it in from CapaDescriptor. Overrode XMLEditorDescription Don Mitchell 2013-01-03 11:15:06 -05:00
  • 702636c00c Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-03 11:01:56 -05:00
  • 31141299e8 Cache to pull CR's cleanup of branch Don Mitchell 2013-01-03 11:00:41 -05:00
  • b91e85c09f Remove tiny_mce. cahrens 2013-01-03 10:53:42 -05:00
  • e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge Chris Dodge 2013-01-03 10:46:24 -05:00
  • 7229a9cdaf perform a new merge from master, resolve conflicts Chris Dodge 2013-01-03 10:43:03 -05:00
  • e1b7a266fb Remove askbot. cahrens 2013-01-03 10:42:54 -05:00
  • 4ede8d6ab6 tiny_mce cahrens 2013-01-03 09:50:35 -05:00
  • f95499b14d Work in progress, related to rich HTML editor. cahrens 2013-01-03 09:48:36 -05:00
  • c76f37050a introduce form to template Brian Wilson 2013-01-03 03:22:37 -05:00
  • 233a35e01e Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 11:32:10 +02:00
  • 7a8d83a17f Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 11:21:18 +02:00
  • c5cd67a6a5 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 10:55:10 +02:00
  • f2cce07bd7 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 10:52:48 +02:00
  • 37c7967e8c Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 10:51:34 +02:00
  • 213ca3fa32 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 10:50:02 +02:00
  • fd0ec0ed8a Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 10:42:40 +02:00
  • de63541049 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:49:31 +02:00
  • d0c72ebe16 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:46:39 +02:00
  • 8af93229d3 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:44:08 +02:00
  • 7cf848db9e Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:34:24 +02:00
  • c4f336d8fd Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine. valera-rozuvan 2012-12-05 09:31:43 +02:00
  • 8f120f1d27 Work on RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:26:46 +02:00
  • c94530cb01 Added initial RequireJS Jasmine test. valera-rozuvan 2012-12-05 09:16:37 +02:00
  • 62271fe5c6 Added namespaced RequireJS. valera-rozuvan 2012-12-04 18:09:52 +02:00
  • 4abd9cd3d4 get closer to working again Brian Wilson 2013-01-02 18:56:25 -05:00
  • c89ff2ac0e Basic peer grading view using mocks and some cleanup in the peer grading service Diana Huang 2013-01-02 17:44:58 -05:00
  • 4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor Don Mitchell 2013-01-02 17:39:27 -05:00
  • 465c85b04b Make model classes inherit their parents fields attribute Calen Pennington 2013-01-02 15:08:49 -05:00
  • 0bed19648e Remove filename and giturl references Calen Pennington 2013-01-02 15:08:27 -05:00
  • 4040f9749d Correctly parse timetuple into datetime Calen Pennington 2013-01-02 15:08:09 -05:00
  • 7f39dd974b Minor whitespace cleanup Calen Pennington 2013-01-02 15:07:56 -05:00
  • 4bec871b0f Don't return BadRequest classes, return instances Calen Pennington 2013-01-02 15:07:12 -05:00
  • 8e0d218c7d Stop using .definition and .metadata directly Calen Pennington 2013-01-02 15:06:43 -05:00
  • 8737009679 Merge branch 'master' into diana/peer-grading-views Diana Huang 2013-01-02 15:04:18 -05:00
  • edd9b2bc7b Merge pull request #1220 from MITx/fix/cdodge/handout-links chrisndodge 2013-01-02 12:02:24 -08:00
  • 37f261f906 Move peer grading so that there are the individual problem pages and the problem list page Diana Huang 2013-01-02 15:01:59 -05:00
  • b5ccb4b8fc trigger another build Chris Dodge 2013-01-02 15:01:21 -05:00
  • fa0fd4b50b Merge pull request #1219 from MITx/fix/cdodge/handout-links chrisndodge 2013-01-02 11:29:56 -08:00
  • d008cb9f3c another comment commit just to trigger a new build Chris Dodge 2013-01-02 14:25:35 -05:00
  • 94f396b988 Merge pull request #1218 from MITx/bug/btalbot/editview-images Don Mitchell 2013-01-02 10:19:36 -08:00
  • a5aafc42ad studio - resolved unit editing bug where larger images would overflow out of editing visual area Brian Talbot 2013-01-02 12:58:59 -05:00
  • 56d17d8a8a Improve some comments and names in the acceptance test framework Jay Zoldak 2012-12-20 09:19:06 -05:00
  • d5111b9ed9 Get lettuce tests running against test database Jay Zoldak 2012-12-18 16:20:23 -05:00
  • ccc8b599f1 Fixed tests to work OK so far. Jay Zoldak 2012-12-14 17:16:29 -05:00
  • 7e5a67badf Add new partner universities and remove cs50 from smart accordion testing Jay Zoldak 2012-12-14 16:41:44 -05:00
  • 7f6d55ad86 Create acceptance tests for open ended grading. Jay Zoldak 2012-12-11 17:16:15 -05:00
  • 6df565e468 Interim work on open-ended grading acceptance testing POC Jay Zoldak 2012-12-10 16:48:26 -05:00
  • d65985b445 Use beautiful soup to massage the HTML for easier comparison. Jay Zoldak 2012-12-04 12:09:50 -05:00
  • 8934f54d6f Save the HTML to a file for each section and comment out debug msgs Jay Zoldak 2012-12-03 13:17:54 -05:00
  • 5cad5d5fba Add scenarios for all Fall 2012 courses to smart accordion feature. Jay Zoldak 2012-12-03 12:46:40 -05:00
  • 20cc930312 Bring over acceptance test changes from cms master branch. Jay Zoldak 2012-11-30 16:22:44 -05:00
  • af4f1668d7 Stub out the video and capture the html files of the high level tabs for diff comparison Jay Zoldak 2012-11-30 12:20:35 -05:00
  • 10275e9709 Add item checking within courseware tabs Jay Zoldak 2012-11-29 13:17:45 -05:00
  • a40ea202d2 Cleanup of imports in courseware tests Jay Zoldak 2012-11-28 11:12:31 -05:00
  • 0a77dd4431 Smart accordion walkthrough working for cms-master branch Jay Zoldak 2012-11-28 09:17:57 -05:00