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

Commit Graph

  • e0469c35ce trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins Chris Dodge 2012-12-12 21:13:51 -05:00
  • 6e2159cb1a Merge pull request #1139 from MITx/fix/cdodge/code-mirror-on-course-info chrisndodge 2012-12-12 17:49:38 -08:00
  • 35317b0679 more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics. Chris Dodge 2012-12-12 20:47:37 -05:00
  • e75f63e957 More merge repairs. Hopefully done. Don Mitchell 2012-12-12 17:13:55 -05:00
  • bf9f9c1c48 added boxsizing polyfill Tom Giannattasio 2012-12-12 17:03:12 -05:00
  • d1520792b8 removed extra width Tom Giannattasio 2012-12-12 17:00:54 -05:00
  • b4321931a0 pearson ie7 bugs fixed (ish) Tom Giannattasio 2012-12-12 16:59:38 -05:00
  • ea6532efd7 Fix screwed up merge Don Mitchell 2012-12-12 16:51:05 -05:00
  • da73fc77d5 Merge pull request #1137 from MITx/fix/cdodge/code-mirror-on-course-info chrisndodge 2012-12-12 12:07:18 -08:00
  • 84b08b5ef5 call remove() on CodeMirror Chris Dodge 2012-12-12 15:03:49 -05:00
  • 98b09a150c Merge pull request #1136 from MITx/feature/christina/misc Calen Pennington 2012-12-12 11:26:30 -08:00
  • 94ee5b887a Try running xmodule Jasmine tests on Jenkins. Christina Roberts 2012-12-12 14:24:05 -05:00
  • caf143514c debugged tooltip latency/vanishing issue Brian Talbot 2012-12-12 14:11:30 -05:00
  • d3de52e649 Merge pull request #1134 from MITx/fix/cdodge/code-mirror-on-course-info chrisndodge 2012-12-12 11:10:43 -08:00
  • 0c68ba8bfa dispose of when we close the editor Chris Dodge 2012-12-12 14:09:09 -05:00
  • 710d73a938 Merge pull request #1133 from MITx/feature/christina/misc chrisndodge 2012-12-12 10:55:46 -08:00
  • 833a58d626 grading - post- cms-master rebase CSS tweaks on overview template Brian Talbot 2012-12-12 13:44:12 -05:00
  • df7de980b3 added in additional tool tips for icon/graphic-based controls on overview Brian Talbot 2012-12-04 10:55:08 -05:00
  • 25e730d0c3 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
  • 85e937cb94 grading - tooltip for grading UI link wip Brian Talbot 2012-12-03 16:20:05 -05:00
  • fd41a2f6b1 grading - added in sub section controls Brian Talbot 2012-12-03 16:13:18 -05:00
  • 2b6bfc4f2b grading - added in gradable by type menu to sub section editing Brian Talbot 2012-12-03 10:47:56 -05:00
  • 4cd2114f3b grading - finalized style/states for grading UI on courseware overview Brian Talbot 2012-12-03 09:53:06 -05:00
  • bdebc60266 assignments - wip Brian Talbot 2012-11-30 13:59:48 -05:00
  • 5239dcc9bd gradable sections - adding in assets and markup - wip Brian Talbot 2012-11-28 16:12:34 -05:00
  • 2f55583ee7 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/christina/misc Christina Roberts 2012-12-12 13:08:22 -05:00
  • c87eb08b1e Bug fix for Lighthouse #22. html names are automatically converted to the symbols they describe. Christina Roberts 2012-12-12 12:57:31 -05:00
  • 71455f760e Check for null dates before setting time in timepicker. Remove syllabus as it's not instrumented. Don Mitchell 2012-12-12 11:37:04 -05:00
  • cd23c8f8b6 Python path bug Don Mitchell 2012-12-12 11:02:42 -05:00
  • 95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from Chris Dodge 2012-12-12 10:57:06 -05:00
  • d1c0eb8fc2 Somehow linked file disappeared again. Don Mitchell 2012-12-12 10:55:57 -05:00
  • bb31fb748f Somehow linked file disappeared again. Don Mitchell 2012-12-12 10:49:22 -05:00
  • 04ea2c8242 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/dhm/cms-settings Don Mitchell 2012-12-12 10:23:06 -05:00
  • 056bad4c66 Time zone prompt change and tooltip CodeMirror on overview entry Don Mitchell 2012-12-12 10:18:39 -05:00
  • 96daea5c0a Ignore discussion modules with missing keys when building the global discussion info Calen Pennington 2012-12-12 09:40:31 -05:00
  • 6e492aba7e Merge pull request #1128 from MITx/diana/instructor-skip-button Victor Shnayder 2012-12-11 15:12:55 -08:00
  • 59829a897c Add error message when encountering an error posting back without a proper error response object Diana Huang 2012-12-11 18:09:25 -05:00
  • d7591bc0c1 Show the timezone and current time (on tooltip) Don Mitchell 2012-12-11 18:02:09 -05:00
  • c4f4da5e46 Giving up for now on unit tests which mock http posts Don Mitchell 2012-12-11 17:10:04 -05:00
  • 4e81d9b2c5 Add some helpful indents and move the submission box to make grading easier to read Diana Huang 2012-12-11 16:10:26 -05:00
  • 6b59fd4de2 update 2 Your Name 2012-12-11 15:54:46 -05:00
  • df5a62305c update Your Name 2012-12-11 15:51:17 -05:00
  • 41167a49a1 Merge branch 'master' into bugfix/kevin/mathjax-rendering Your Name 2012-12-11 15:47:43 -05:00
  • 85bffa6aaf Merge branch 'master' into diana/instructor-skip-button Diana Huang 2012-12-11 15:47:21 -05:00
  • 343dde6e29 fixed coffeescript to render mathjax correctly Your Name 2012-12-11 15:47:20 -05:00
  • 44d5a34180 Merge branch 'diana/instructor-skip-button' of github.com:MITx/mitx into diana/instructor-skip-button Diana Huang 2012-12-11 15:46:18 -05:00
  • fbc0dfae74 Merge pull request #1116 from MITx/feature/btalbot/cms-tooltips chrisndodge 2012-12-11 12:33:19 -08:00
  • 785974da67 Merge pull request #1126 from MITx/diana/open-ended-tests Victor Shnayder 2012-12-11 12:31:26 -08:00
  • 0e54592175 Add skip button logic to the LMS Diana Huang 2012-12-11 14:06:07 -05:00
  • 33f2d55a37 new test for problem lists Diana Huang 2012-12-10 16:31:43 -05:00
  • a46c1f4883 Updated underscore (using _.invert()) The scss junk comes from trying to sync w/ several branches. I believe it's right but mostly unnecessary (surprised it showed up). Debugged the merge w/ cms-master Fixed grace period to be absolute time difference not a date on the client side. Don Mitchell 2012-12-11 14:18:13 -05:00
  • 43d76b9813 Add skip button logic to the LMS Diana Huang 2012-12-11 14:06:07 -05:00
  • 3b805fac1a Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing Diana Huang 2012-12-11 10:24:53 -08:00
  • b4fffc798c Fix for issues in open ended parsing Vik Paruchuri 2012-12-11 13:14:34 -05:00
  • 0e3a022086 fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo Chris Dodge 2012-12-11 11:21:08 -05:00
  • 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/dhm/cms-settings Don Mitchell 2012-12-11 10:55:10 -05:00
  • 370dfc77ea Merge branch 'master' into diana/open-ended-tests Diana Huang 2012-12-11 09:53:05 -05:00
  • 6e108c7531 fix conflict Kevin Chugh 2012-12-10 19:30:04 -05:00
  • 70e2e04814 Remove not yet wired tabs Don Mitchell 2012-12-10 18:57:48 -05:00
  • 5ea5a7c0a7 It works!!! Don Mitchell 2012-12-10 18:55:35 -05:00
  • c43aa62fce Need to still add create and delete but otherwise done. Don Mitchell 2012-12-10 18:01:28 -05:00
  • 5cf9982c4a Merge pull request #1121 from MITx/feature/jarv/ipython Carlos Andrés Rocha 2012-12-10 14:26:34 -08:00
  • 8aebb14eea Adding ipython to requirements John Jarvis 2012-12-10 17:15:31 -05:00
  • 39024a7fee Grading mostly working Don Mitchell 2012-12-10 16:32:33 -05:00
  • 4a2dabd30a new test for problem lists Diana Huang 2012-12-10 16:31:43 -05:00
  • c3d7c466ef Merge pull request #1120 from MITx/feature/christina/misc chrisndodge 2012-12-10 13:08:52 -08:00
  • 6acae5b440 Show error if organization name has invalid characters Christina Roberts 2012-12-10 15:19:34 -05:00
  • df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling Victor Shnayder 2012-12-10 11:36:04 -08:00
  • a651a7798e Merge pull request #1118 from MITx/bugfix/victor/open-ended-parsing VikParuchuri 2012-12-10 11:27:39 -08:00
  • ab84042435 Fix raised error Vik Paruchuri 2012-12-10 14:24:00 -05:00
  • 7279d11cf2 Add a reload button to open-ended input problems Diana Huang 2012-12-10 14:16:00 -05:00
  • ed1f4bdd85 Check for none. Victor Shnayder 2012-12-10 14:10:19 -05:00
  • c0ca573dcf Merge pull request #1117 from MITx/feature/dhm/course-info chrisndodge 2012-12-10 10:56:30 -08:00
  • e2e5246853 we also need to set on window scope Chris Dodge 2012-12-10 13:54:35 -05:00
  • c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling Victor Shnayder 2012-12-10 10:39:19 -08:00
  • 3f5254adb0 Added tool tip text to several other UI controls in templates Brian Talbot 2012-12-10 13:32:06 -05:00
  • a3579e3183 added in basic styles and plug-in reference for tool tip UI across Studio + Courseware Overview tool tip text Brian Talbot 2012-12-10 13:02:55 -05:00
  • 3156c2b393 Add icon to the grading message Diana Huang 2012-12-10 12:29:46 -05:00
  • 495b58241c Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property. Christina Roberts 2012-12-10 11:50:21 -05:00
  • e55d8fb21c Merge pull request #1115 from MITx/feature/dhm/course-info chrisndodge 2012-12-10 08:26:08 -08:00
  • 53f40e8d85 on AWS instances, base.js gets wrapped into a single JS file, but it's in a different scope. So to reference one of the globals in base.js, we have to reference it as window.XXXXXX. Chris Dodge 2012-12-10 11:25:25 -05:00
  • cc72870aac Make oepn-ended responses and self-assessment answers use the same CSS Diana Huang 2012-12-10 11:00:28 -05:00
  • 85b5190c29 fix login hack. Uses new return-error-msg-if-not-logged-in behavior Victor Shnayder 2012-12-10 10:41:40 -05:00
  • e1c452bc08 Merge pull request #1113 from MITx/feature/dhm/course-info chrisndodge 2012-12-10 07:17:19 -08:00
  • 79e48dde97 move the underscore tempaltes to /static/client-templates and update the references Chris Dodge 2012-12-10 10:01:08 -05:00
  • c9d399d3bd Update instructor grading message with more accurate information Diana Huang 2012-12-10 09:35:30 -05:00
  • a4ed3a7ba9 Merge pull request #1088 from MITx/feature/dhm/course-info chrisndodge 2012-12-10 05:59:59 -08:00
  • faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities Carlos Andrés Rocha 2012-12-10 03:32:41 -08:00
  • 76f76a4ff8 Update tests and mock objects to work with the new API Diana Huang 2012-12-07 17:30:03 -05:00
  • 27b8f01ffa Added the following analyzers: StudentsActive, OverallGradeDistribution, StudentsDropoffPerDay. JM Van Thong 2012-12-07 17:26:33 -05:00
  • b069f95c07 Merge pull request #1109 from MITx/feature/dave/pearson_ie7 David Ormsbee 2012-12-07 14:08:46 -08:00
  • 4ccf7c351d Fix service errors so that individual problems can now be displayed and graded Diana Huang 2012-12-07 16:56:51 -05:00
  • 7f9fcfffdf Add support for the new staff grading views on the backend Diana Huang 2012-12-07 16:29:57 -05:00
  • 5030c9d35b Cleanup of the meta information styles and make the feedback box less important. Diana Huang 2012-12-07 11:20:05 -05:00
  • 1026c64111 Fix up some more of the meta info container Diana Huang 2012-12-06 18:15:40 -05:00
  • 275c9ef7fd Update API with server and add new meta info box for meta information Diana Huang 2012-12-06 17:19:22 -05:00
  • 7c768cbbff Wire up the separate action button Diana Huang 2012-12-06 14:31:02 -05:00
  • aee1e5e9a9 Updates to the list view and error container Diana Huang 2012-12-06 14:29:45 -05:00
  • ef82ced2af Improve the paragraph maker on the staff grading page Diana Huang 2012-12-06 13:24:20 -05:00
  • ffa42b6f11 Styles for the new instructor grading interface Diana Huang 2012-12-06 10:45:48 -05:00