Commit Graph

  • fcc1ab71f6 Update the formatting and layout of the Instructor Grading interface. Diana Huang 2012-12-06 10:44:03 -05:00
  • b5f3386d27 Add breadcrumbing and clarify some of the text on the instructor grading interface. Diana Huang 2012-12-05 16:38:54 -05:00
  • 5914b1cf91 Make the mock backend support different problems, and make sure the location is passed around properly. Clarify some of the numbers for the user Diana Huang 2012-12-05 16:15:49 -05:00
  • 94e1a9ffd3 Clean up some minor issues with list view and display some new information on the problem-specific page Diana Huang 2012-12-05 14:38:53 -05:00
  • 48b9043213 Initial problem list functionality Diana Huang 2012-12-05 13:08:22 -05:00
  • e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. David Ormsbee 2012-12-07 16:03:05 -05:00
  • 457b4aa645 Merge pull request #1108 from MITx/feature/cdodge/course-info Don Mitchell 2012-12-07 12:51:09 -08:00
  • 368b59a9e6 updated tooltips Kevin Chugh 2012-12-07 15:39:53 -05:00
  • 299b28007b clean up of users page Tom Giannattasio 2012-12-07 15:37:22 -05:00
  • 402e031ecc forgot to add a if {} guard on the CodeMirror instantiation on one use case Chris Dodge 2012-12-07 15:27:00 -05:00
  • b81f802b1d get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror Chris Dodge 2012-12-07 14:38:03 -05:00
  • c8b4e8852f added modal cover for editors Tom Giannattasio 2012-12-07 14:31:48 -05:00
  • b4793b3277 Add an implementation of get_items to xml module store Calen Pennington 2012-12-07 12:02:29 -05:00
  • cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ Carlos Andrés Rocha 2012-12-07 11:59:13 -05:00
  • 7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading David Ormsbee 2012-12-07 08:44:58 -08:00
  • 47ed02c9ea Remove more merge badness Calen Pennington 2012-12-07 11:30:21 -05:00
  • 3e568667fc Fix merge badness Calen Pennington 2012-12-07 11:24:25 -05:00
  • 3b75bbdc6f Actually run cms tests on cms master Calen Pennington 2012-12-07 11:18:38 -05:00
  • c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master Calen Pennington 2012-12-07 11:17:41 -05:00
  • 98fefd14c5 Merge pull request #1105 from MITx/feature/cale/github-status-api David Ormsbee 2012-12-07 08:09:00 -08:00
  • 38671fc83c Move files from base.sh to test.sh Calen Pennington 2012-12-07 11:01:58 -05:00
  • e2ed7d1c4e Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master Calen Pennington 2012-12-07 10:56:24 -05:00
  • 5a3cdc11cd Only mark github commit status when full test suite passes Calen Pennington 2012-12-07 10:41:24 -05:00
  • d4ec5946d4 Mark failed state correctly Calen Pennington 2012-12-07 10:37:44 -05:00
  • 44a8f31d06 Change are-we-logged-in detection to be less hackish. Victor Shnayder 2012-12-06 13:39:07 -05:00
  • 730cdd3b4f minor changes from pull request comments Victor Shnayder 2012-12-06 12:00:03 -05:00
  • 53580af952 fix aws setting name Victor Shnayder 2012-12-06 11:59:18 -05:00
  • bd94474a50 improve docstring Victor Shnayder 2012-12-06 11:38:21 -05:00
  • 7190e484f1 Use a namedtuple for parsing ScoreMessages Victor Shnayder 2012-12-06 11:32:33 -05:00
  • bf593c6603 clean up imports Victor Shnayder 2012-12-06 11:27:58 -05:00
  • 42f8afb083 address minor code review comments Victor Shnayder 2012-12-06 11:07:28 -05:00
  • 3da727125f fix feedback formatting Victor Shnayder 2012-12-06 11:06:13 -05:00
  • 3f5187401d Change message with state Calen Pennington 2012-12-07 10:29:13 -05:00
  • 6d2688cb66 unicode fix and cleanup in stringify children Victor Shnayder 2012-12-06 11:05:28 -05:00
  • 86579efc5b Source jenkins/base.sh with the correct path Calen Pennington 2012-12-07 09:59:21 -05:00
  • 130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed Chris Dodge 2012-12-07 09:45:12 -05:00
  • 724cba193a Source the base jenkins configuration before running tests Calen Pennington 2012-12-07 09:43:52 -05:00
  • d4cdd5b485 Make jenkins talk to the github status api Calen Pennington 2012-12-07 09:38:47 -05:00
  • 1a89c14b62 Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs Calen Pennington 2012-12-07 06:38:16 -08:00
  • 75b413b5ac reworked add component steps Tom Giannattasio 2012-12-07 09:35:34 -05:00
  • 0bc0657939 Add in support for ordering tags properly in feedback box Vik Paruchuri 2012-12-07 09:21:23 -05:00
  • 258b1fe9a5 thread responses create fixed Kevin Chugh 2012-12-06 22:12:17 -05:00
  • 61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule David Ormsbee 2012-12-06 15:33:21 -08:00
  • edbc12e1e3 homepage - added georgetown logo assets and resized other university logos to match 3x3 layout Brian Talbot 2012-12-06 17:02:43 -05:00
  • 22a61cdfb7 pulled out component types from behind add component button Tom Giannattasio 2012-12-06 17:00:16 -05:00
  • 8a6a0673e6 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging marco 2012-12-06 16:43:19 -05:00
  • 00d1a7c73b added flag icons back in with proper transparency marco 2012-12-06 16:42:15 -05:00
  • 6c75a71e8c cleaned up subsection and unit page Tom Giannattasio 2012-12-06 16:34:13 -05:00
  • 14b0cc019f remove debug placeholders, finalize render of comments, flagging working on posts, replies, and comments Kevin Chugh 2012-12-06 16:26:08 -05:00
  • cc870f8ecd homepage - changed partner university listing layout to handle 6 partners Brian Talbot 2012-12-06 14:37:09 -05:00
  • 1a40209082 cleaned up editor styles; cleaned up static tabs page Tom Giannattasio 2012-12-06 14:25:30 -05:00
  • deb3888a84 thread response flagging Kevin Chugh 2012-12-06 14:13:54 -05:00
  • 70b0b5beb8 update models Kevin Chugh 2012-12-06 10:43:51 -05:00
  • 4139f702ff debugging thread Kevin Chugh 2012-12-06 10:30:06 -05:00
  • 28e86f9602 Merge branch 'master' into feature/kevin/flagging Kevin Chugh 2012-12-06 09:31:39 -05:00
  • b10b6e2b3f Added more analytics to instructor dashboard. JM Van Thong 2012-12-05 23:21:00 -05:00
  • 50db11a647 urls and views for comment flagging Kevin Chugh 2012-12-05 17:08:29 -05:00
  • 6d89835245 more defined header, new icons, cleaner static tabs page Tom Giannattasio 2012-12-05 17:01:29 -05:00
  • c4be2b514a update coffee Kevin Chugh 2012-12-05 13:25:22 -05:00
  • 1eaf424c20 Change some things to use format Vik Paruchuri 2012-12-05 13:17:16 -05:00
  • e813dc3514 Address format issue and exception Vik Paruchuri 2012-12-05 12:08:26 -05:00
  • ad84a961da new header styles; collapse all button added to courseware Tom Giannattasio 2012-12-05 12:05:14 -05:00
  • 70d0fd11b7 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging Your Name 2012-12-05 11:21:16 -05:00
  • 3a7624d384 modify verbiage of flagging Your Name 2012-12-05 11:20:31 -05:00
  • 3795b3a785 Address Dave's comments Victor Shnayder 2012-12-05 10:56:12 -05:00
  • 3b3ee2bf52 Merge branch 'feature/victor/instructor-grading' of github.com:MITx/mitx into feature/victor/instructor-grading Victor Shnayder 2012-12-05 10:37:24 -05:00
  • 97016d6168 video time frame support for xmodule Alexander Kryklia 2012-12-05 17:18:35 +02:00
  • a498377ad5 Merge pull request #1102 from MITx/diana/instructor-grading-styling Victor Shnayder 2012-12-05 06:49:47 -08:00
  • 5ebde2a93e fix comment Diana Huang 2012-12-05 09:42:30 -05:00
  • cb6bb38f84 merge commit Diana Huang 2012-12-05 09:40:53 -05:00
  • 7887f556d9 Add docs on using a queue server on aws from a local LMS Victor Shnayder 2012-12-05 09:29:42 -05:00
  • 90076c39e6 add in some new mock responses for our staff grading API Diana Huang 2012-12-05 09:25:05 -05:00
  • 7390015799 parameters in display video Alexander Kryklia 2012-12-05 14:43:35 +02:00
  • 40f34d19a3 add initial mock of get_problems call Victor Shnayder 2012-12-04 17:46:34 -05:00
  • 1d87dab3a7 remove queueing spinner and polling logic, change message Victor Shnayder 2012-12-04 17:45:51 -05:00
  • 1d9d347df9 Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap Victor Shnayder 2012-12-04 13:59:06 -08:00
  • cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. David Ormsbee 2012-12-04 15:51:36 -05:00
  • 13581bcfcb updated flag icons to have proper transparency marco 2012-12-04 15:47:58 -05:00
  • 8ad01c7340 fix comments and replies Your Name 2012-12-04 15:47:42 -05:00
  • 81dae33f1c added flag-label coloring css marco 2012-12-04 14:58:28 -05:00
  • 72ebf4c862 style tweaks to tabs and static pages; key bindings for new user form Tom Giannattasio 2012-12-04 14:54:02 -05:00
  • c57b9f3240 merge prompt and ml accuracy display Victor Shnayder 2012-12-04 14:43:40 -05:00
  • d4a3e4d044 fix logger name Victor Shnayder 2012-12-03 14:08:23 -05:00
  • a5a38c0116 fix conflict Your Name 2012-12-04 14:09:46 -05:00
  • 6a19f4e02a changes to underscore template Your Name 2012-12-04 14:08:39 -05:00
  • 64663c34dd added flag resources marco 2012-12-04 14:04:31 -05:00
  • 7cba7c9b41 tweaked body color and window styles; adjusting new buttons Tom Giannattasio 2012-12-04 13:49:07 -05:00
  • 70f35b2e15 remove skipped tests that use mongo Brian Wilson 2012-12-04 13:46:32 -05:00
  • c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule Brian Wilson 2012-12-04 13:26:37 -05:00
  • cde20758f8 cosmetic cleanup Brian Wilson 2012-12-04 13:25:04 -05:00
  • 39d48b1966 Change daily activity to be course specific. JM Van Thong 2012-12-04 12:00:27 -05:00
  • dfb9913100 clean up lms tests, and fix export/import Brian Wilson 2012-12-04 11:52:35 -05:00
  • a0104f6526 add flagging interface to replies and comments Your Name 2012-12-04 11:35:20 -05:00
  • 4e7d931d7e removed new course button on click to prevent multiple instantiations Tom Giannattasio 2012-12-04 11:00:28 -05:00
  • 63637579f4 added in additional tool tips for icon/graphic-based controls on overview Brian Talbot 2012-12-04 10:55:08 -05:00
  • 94a12bddb6 Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent Carlos Andrés Rocha 2012-12-04 07:27:59 -08:00
  • c702bbcd85 Modify Wellesley rollover logo Carlos Andrés Rocha 2012-12-04 10:27:23 -05:00
  • 4f9f17d3bb Merge pull request #1098 from MITx/content/rocha/wellesley-announcmenent Carlos Andrés Rocha 2012-12-04 07:01:47 -08:00
  • c60aa6789a grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template Brian Talbot 2012-12-04 09:59:44 -05:00
  • 4d6162b1df Fix incorrect Facebook URL for Wellesley news announcement Carlos Andrés Rocha 2012-12-04 09:58:50 -05:00