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

Commit Graph

  • 735aa13496 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-07 16:48:57 -05:00
  • e46a76da98 xml conversion unit tests plus a fix to the conversion which they brought to light Don Mitchell 2013-01-07 16:48:42 -05:00
  • c7d81cc425 be sure to return an instance of the class Chris Dodge 2013-01-07 16:28:30 -05:00
  • 3f254fc3c7 Merge branch 'master' into diana/peer-grading-views Diana Huang 2013-01-07 15:57:39 -05:00
  • 02247172a2 Fix some interstitial page CSS Diana Huang 2013-01-07 15:55:14 -05:00
  • bbc5cd50bc Add in default value for MOCK_PEER_GRADING Diana Huang 2013-01-07 15:49:48 -05:00
  • b7473f8017 Make mock service return useful data Diana Huang 2013-01-07 15:40:01 -05:00
  • 5711a9af68 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-07 15:32:39 -05:00
  • d7b05e485d Add insertion of problem types. cahrens 2013-01-07 15:32:11 -05:00
  • 1db70050ff Merge pull request #1235 from MITx/fix/zoldak/clarify-doc Victor Shnayder 2013-01-07 12:29:11 -08:00
  • d3fd6ac151 Clarify the syntax of the rake fasttest command Jay Zoldak 2013-01-07 15:23:08 -05:00
  • 2ec11e5b92 pearson registration - refined error output and accommodation field display toggling Brian Talbot 2013-01-07 15:15:50 -05:00
  • e1ec4eec71 Get tests to pass by creating a mock peer grading service Diana Huang 2013-01-07 14:46:32 -05:00
  • e428e9cb2a Merge pull request #1234 from MITx/fix/zoldak/clarify-doc Victor Shnayder 2013-01-07 11:19:27 -08:00
  • 0c6e8c4820 Clarify that you need to start up the mongo daemon Jay Zoldak 2013-01-07 14:08:18 -05:00
  • d8d4c37331 Yaml files now generate markdown in a readable and xml convertable format. The xml converter works. Don Mitchell 2013-01-07 13:57:21 -05:00
  • 791c00cd7b Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2 chrisndodge 2013-01-07 09:57:33 -08:00
  • 82b48dd20b put back in .gitmodules which got accidentally deleted Chris Dodge 2013-01-07 12:43:18 -05:00
  • 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 Chris Dodge 2013-01-07 12:34:48 -05:00
  • 9dad3ba90d Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-07 12:33:55 -05:00
  • c2f0ea49bd Hopefully fixed yamls for markdown Don Mitchell 2013-01-07 12:32:54 -05:00
  • 75b9740932 Update for Don's change. cahrens 2013-01-07 12:08:34 -05:00
  • e296d52c7d merge cahrens 2013-01-07 12:06:12 -05:00
  • be07c7f86f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-07 12:01:54 -05:00
  • bf2a945a6c Starting to add toolbar items. cahrens 2013-01-07 12:01:12 -05:00
  • 42246142dd Numerical response now works and round tripping works. Don Mitchell 2013-01-07 11:50:37 -05:00
  • 0e9cf17b82 Merge pull request #1232 from MITx/feature/christina/misc Jay Zoldak 2013-01-07 08:43:48 -08:00
  • c443cd83fa Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-07 11:17:05 -05:00
  • 12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can differentiate them in the drop down (just added MD to names for now--brian's doing the official differentiation) Don Mitchell 2013-01-07 10:55:10 -05:00
  • b108435a32 Make xmodule Jasmine tests fail build. cahrens 2013-01-07 10:51:32 -05:00
  • 4740965413 Skip tests instead of commenting them out (for merge that is coming). cahrens 2013-01-07 10:49:10 -05:00
  • 60f5089941 Merge pull request #1231 from MITx/content/rocha/job-page-update Carlos Andrés Rocha 2013-01-07 07:31:48 -08:00
  • 9ec658cf7d Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests. cahrens 2013-01-07 10:25:42 -05:00
  • 56f1c6aad9 Fixed extra characters in faq page Carlos Andrés Rocha 2013-01-07 10:14:00 -05:00
  • faa2373256 Fix typo in the job page Robert Chirwa 2013-01-04 13:34:59 -05:00
  • 534c294e08 Merge branch 'feature/cale/cms-master' into feature/christina/misc cahrens 2013-01-07 09:59:42 -05:00
  • ab1173cfdc Merge with cms-master. cahrens 2013-01-07 09:59:08 -05:00
  • 7ced6b5e68 Merge pull request #1222 from MITx/feature/cale/cms-master-merge chrisndodge 2013-01-07 06:54:57 -08:00
  • 2293a37f7d Move over old Staff Grading tests to new app. Diana Huang 2013-01-07 09:17:09 -05:00
  • 6b8944ad6b studio - section expanding/collapsing UI - wip Brian Talbot 2013-01-07 09:07:40 -05:00
  • e57656e24f Add TestCenterExam class to course module, and plumb through. Brian Wilson 2013-01-06 17:57:13 -05:00
  • 05428f5b07 Comment out markdown in optionresponse.yaml, hook up toXML method. cahrens 2013-01-05 15:08:09 -05:00
  • 164d8a50f1 Move toXML code into edit.coffee, create unit test scaffolding. cahrens 2013-01-05 14:39:58 -05:00
  • 96bad91353 Comment out Jasmine tests that are failing. cahrens 2013-01-05 14:07:34 -05:00
  • 65ee5105e2 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-05 13:16:44 -05:00
  • 9a0d85667c symmath use https, no server cert verify ichuang 2013-01-05 17:24:54 +00:00
  • bf3669395b update symmath snuggletex server ichuang 2013-01-05 16:47:40 +00:00
  • ea8a56da0a add id generation and validation Brian Wilson 2013-01-04 18:45:46 -05:00
  • e410703e33 Minor bug fixes and improvements Diana Huang 2013-01-04 17:20:03 -05:00
  • 2e527a6ae0 Fixed all regex's in toXml (I hope) and added 2 markdown templates Don Mitchell 2013-01-04 17:15:44 -05:00
  • 093560e859 Updates to copy and styling and a few bugfixes Diana Huang 2013-01-04 16:36:28 -05:00
  • 789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api Calen Pennington 2013-01-04 16:19:58 -05:00
  • fa09e25a1a Add interstitial page between calibration and grading. Make individual Prompt and Rubric Sections hideable. Diana Huang 2013-01-04 15:18:39 -05:00
  • e88fbd26e3 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-04 14:12:18 -05:00
  • befe36f626 Improvements to calibration feedback step Diana Huang 2013-01-04 14:11:48 -05:00
  • ce4994dd94 studio - revised course overview section collapse button to toggle collapsing/expanding Brian Talbot 2013-01-04 13:27:59 -05:00
  • ad63c492be Minor updates to the page to handle showing Calibration feedback. Also, allow for the hiding of the Prompt and the Rubric. Diana Huang 2013-01-04 12:42:38 -05:00
  • 2859cfddd0 minor cleanup cahrens 2013-01-04 12:37:00 -05:00
  • 1d7baccb38 add info-icon.png Chris Dodge 2013-01-04 11:41:16 -05:00
  • d2228205e2 Merge branch 'master' into diana/peer-grading-views Diana Huang 2013-01-04 11:19:10 -05:00
  • b5f34a9da6 Show special text when calibrating or when grading. Diana Huang 2013-01-04 11:03:24 -05:00
  • 349fd89eb8 fix tests on merge Chris Dodge 2013-01-04 10:32:31 -05:00
  • d0221808db Merge pull request #1228 from MITx/content/rocha/media-kit Carlos Andrés Rocha 2013-01-04 07:07:43 -08:00
  • 04524ef58f media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text Brian Talbot 2013-01-04 10:02:14 -05:00
  • ecfc96c73b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-04 09:57:15 -05:00
  • e017363ae1 Tabs now showing. cahrens 2013-01-04 09:56:52 -05:00
  • 591f1be8ba Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-04 09:51:47 -05:00
  • d99e7f5d33 Supports markdown Don Mitchell 2013-01-04 09:51:36 -05:00
  • 5493fd586a Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-04 09:05:09 -05:00
  • 6d732c217b Tabs now showing. cahrens 2013-01-04 09:04:27 -05:00
  • e32dfcf0a0 get display of validation errors to work. Brian Wilson 2013-01-04 01:39:40 -05:00
  • c555bf5a8d fix capa to add contextualize_text for optionresponse and multiplechoice ichuang 2013-01-03 22:57:24 -05:00
  • c5cc15a92a return json, and add validation errors. Start displaying field with error. Brian Wilson 2013-01-03 18:51:26 -05:00
  • 95e7f2f1eb Merge pull request #1226 from MITx/content/rocha/media-kit Carlos Andrés Rocha 2013-01-03 15:30:08 -08:00
  • 59f4962cfa Fix error in one of the media kit assets URLs Carlos Andrés Rocha 2013-01-03 18:29:34 -05:00
  • c3d7bbe0e0 Merge pull request #1225 from MITx/content/rocha/media-kit Carlos Andrés Rocha 2013-01-03 15:07:55 -08:00
  • 25cb6d5a22 Minor style changes to home page and media kit page Carlos Andrés Rocha 2013-01-03 18:06:22 -05:00
  • 67dea0c3c3 Merge pull request #1224 from MITx/content/rocha/media-kit David Ormsbee 2013-01-03 14:50:57 -08:00
  • fe86c25f72 Bug fixes for the JS and the peer grading service Diana Huang 2013-01-03 17:23:30 -05:00
  • 2e6ac2f72c Fix link to root page on the main page footer Carlos Andrés Rocha 2013-01-03 17:21:54 -05:00
  • 7dfa4e2cba Tabla rasa problem for expert authors Don Mitchell 2013-01-03 17:20:40 -05:00
  • a67b54bf82 media kit - added initial styles to media kit page Brian Talbot 2013-01-03 17:10:16 -05:00
  • 28501ca58e Merge branch 'master' into diana/peer-grading-views Diana Huang 2013-01-03 16:23:14 -05:00
  • 078b2a5b95 Fix up some minor state issues and complete basic JS functionality for page Diana Huang 2013-01-03 16:19:04 -05:00
  • 3e16e4cf5f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-03 14:43:00 -05:00
  • ac5b48e827 Treat metadata['markdown'] as not key/value editable but still persistable. Don Mitchell 2013-01-03 14:42:40 -05:00
  • 533f4876b5 Rename, add css file. cahrens 2013-01-03 14:27:32 -05:00
  • e10e87e6ec media kit - revised link styling on homepage Brian Talbot 2013-01-03 14:21:07 -05:00
  • 8dd02c7ec7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-03 14:11:58 -05:00
  • f443c66bcd Rename, add css file. cahrens 2013-01-03 14:11:53 -05:00
  • becffd4dbb Updated html and javascript for new pages as well as a fix for the peer grading service Diana Huang 2013-01-03 14:08:56 -05:00
  • d11243578b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-03 13:50:16 -05:00
  • c0001597a3 Update some of the templates so that they don't break Diana Huang 2013-01-03 13:47:29 -05:00
  • 1c1034c63b Pass location as a parameter, not as a part of the url Diana Huang 2013-01-03 13:47:03 -05:00
  • 63791b2a6b Numerical response template has markdown init Don Mitchell 2013-01-03 13:46:45 -05:00
  • b4312cbfef Starting the markdown editor. cahrens 2013-01-03 13:39:01 -05:00
  • bd0a2f6630 Add content and assets for media kit Carlos Andrés Rocha 2013-01-03 13:27:07 -05:00
  • f3ba15731c Cache to swap branches Don Mitchell 2013-01-03 13:04:30 -05:00
  • 559bf8874a Merge pull request #1132 from MITx/vik/modify_open_ended David Ormsbee 2013-01-03 10:00:31 -08:00
  • 962d83d71b Display a message when there are no problems to grade Diana Huang 2013-01-03 13:00:02 -05:00