Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 2cdfed9efe Merge pull request #1472 from MITx/feature/christina/misc2 Don Mitchell 2013-02-08 10:15:11 -08:00
• 98026e4325 A couple minor bug fixes. https://edx.lighthouseapp.com/projects/102637/tickets/173 https://edx.lighthouseapp.com/projects/102637/tickets/177 cahrens 2013-02-08 12:46:32 -05:00
• 1b679750ad studio - settings: more revamp of tabs to views WIP Brian Talbot 2013-02-08 12:36:21 -05:00
• a68094515c fix capitalization and spacing Victor Shnayder 2013-02-08 12:33:19 -05:00
• 83a4f40ac6 fix typo; fix phrasing for software engineer job Victor Shnayder 2013-02-08 12:24:07 -05:00
• 61f5991885 Posting lots of new jobs Victor Shnayder 2013-02-08 12:15:09 -05:00
• 4718c9a51a Forgot to define self when I moved code. cahrens 2013-02-08 11:17:02 -05:00
• 0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional Jay Zoldak 2013-02-08 08:13:01 -08:00
• 7244425996 Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static chrisndodge 2013-02-08 08:05:56 -08:00
• 96d119965c limit staff debug verbosity to locations of specific categories ichuang 2013-02-07 23:18:58 -05:00
• 33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content Calen Pennington 2013-02-08 10:49:43 -05:00
• 04cc257bdd fix module staff accesss - by has_access, not by user.is_staff ichuang 2013-02-08 09:00:56 -05:00
• dd4db0601f Remove generated files Calen Pennington 2013-02-08 10:45:59 -05:00
• bda46c423d Fix some issues that were prevent lms start Calen Pennington 2013-02-08 10:41:02 -05:00
• 727843d32e added cohorted mustache template for inline Kevin Chugh 2013-02-08 10:39:59 -05:00
• dc07e7375f studio - settings: revamp of tabs to views WIP Brian Talbot 2013-02-08 09:36:18 -05:00
• ad0d304e67 fix instructor dashboard datadump error message to be useful ichuang 2013-02-08 09:21:36 -05:00
• c6bece8620 more updates Kevin Chugh 2013-02-08 09:11:41 -05:00
• 950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. cahrens 2013-02-08 08:26:24 -05:00
• ab6f383be1 support for Pearson test user Brian Wilson 2013-02-08 03:05:28 -05:00
• f1198b5f5f for starting pearson exam, just call jump_to() instead of reverse(jump_to...) Brian Wilson 2013-02-08 02:15:45 -05:00
• 7ea87793c2 Modified annotatable to retrieve and display instructor comments from span elements. Instructor commentaries are displayed in tooltips with a reply link when the highlighted area is clicked. The commentaries are connected to inline discussion forums by anchors (for now). Arthur Barrett 2013-02-07 19:51:22 -05:00
• 17cc6b4dff Fix minor display issue Vik Paruchuri 2013-02-07 19:26:21 -05:00
• a49f740e87 Fix rubric and make images display with tooltips Vik Paruchuri 2013-02-07 19:22:54 -05:00
• 3cfc5c4545 cohort filter wokorking Kevin Chugh 2013-02-07 19:18:21 -05:00
• 14372a4079 Address some issues with robustness, make images work properly throughout flow Vik Paruchuri 2013-02-07 19:02:01 -05:00
• 68eb802516 Remove images from status bar after finding out that they run afoul of the rewriting of static links. Need to send them back via ajax to avoid Vik Paruchuri 2013-02-07 18:48:13 -05:00
• f5fcd3e1ff Make grader image dict a constant Vik Paruchuri 2013-02-07 18:37:03 -05:00
• 4973363353 Attach images to rubric to indicate which graders scored what Vik Paruchuri 2013-02-07 18:35:09 -05:00
• a2d9e66634 Centralized rubric now displays properly Vik Paruchuri 2013-02-07 18:21:50 -05:00
• 7b7b0690b6 fix test_conditional ichuang 2013-02-07 18:18:45 -05:00
• 7dd252178c cohort filter almost done Your Name 2013-02-07 18:14:46 -05:00
• 3965f9129d cohort filter almost done Your Name 2013-02-07 18:13:53 -05:00
• 9fa16b07d6 Remove ability to manually get results Vik Paruchuri 2013-02-07 18:02:48 -05:00
• c4bf9a0be4 Modify rubric category rendering Vik Paruchuri 2013-02-07 17:47:19 -05:00
• 290368ef0d merge out from master Brian Wilson 2013-02-07 17:40:54 -05:00
• 5154068d75 Debug some score tuple issues Vik Paruchuri 2013-02-07 17:33:03 -05:00
• 7bf0532a04 Fix some issues with displaying grader info on rubric Vik Paruchuri 2013-02-07 17:28:31 -05:00
• 41d35632f3 Working on combined rubric stuff Vik Paruchuri 2013-02-07 17:18:53 -05:00
• fa5537ab71 On first request for handouts, create the db record. (bug 160) Don Mitchell 2013-02-07 17:09:57 -05:00
• 0f81b0f816 Aggregate rubric feedback Vik Paruchuri 2013-02-07 16:51:51 -05:00
• 47d5fe60ef Return feedback items individually Vik Paruchuri 2013-02-07 16:43:21 -05:00
• 091f34668b Support centralized results Vik Paruchuri 2013-02-07 16:40:25 -05:00
• 7f70637331 Merge pull request #1462 from MITx/bug/bug161 Christina Roberts 2013-02-07 13:31:57 -08:00
• c81abe1e35 Merge remote-tracking branch 'origin/master' into 700x-sandbox Victor Shnayder 2013-02-07 16:27:08 -05:00
• 48e582647c bug 171 Don Mitchell 2013-02-07 16:24:43 -05:00
• 095ec9d3b9 Merge pull request #1457 from MITx/feature/cale/dev-staticfiles Victor Shnayder 2013-02-07 13:23:30 -08:00
• f39a98f9ba Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading John Hess 2013-02-07 16:14:42 -05:00
• 4b5457c997 Fixing some rubric score errors Vik Paruchuri 2013-02-07 16:13:07 -05:00
• 80e4944314 minor cleanup Brian Wilson 2013-02-07 16:12:02 -05:00
• 2974b9eec3 Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam Brian Wilson 2013-02-07 15:58:12 -05:00
• cc11dc2aa3 switch to using timelimit module for Pearson test Brian Wilson 2013-02-07 15:57:43 -05:00
• 4a897d4e7f Save rubric scores in self assessment Vik Paruchuri 2013-02-07 15:52:23 -05:00
• 3874fe545a Working on making a combined rubric Vik Paruchuri 2013-02-07 15:46:49 -05:00
• 3ccbd504aa Pillow needs libjpeg-dev to build JPG support. Ned Batchelder 2013-02-07 15:20:42 -05:00
• 4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model Calen Pennington 2013-02-07 15:12:30 -05:00
• 9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding Don Mitchell 2013-02-07 14:56:48 -05:00
• 8a75e1ad19 Added comment Julian Arni 2013-02-07 14:50:18 -05:00
• 31393043d0 More for that commit Don Mitchell 2013-02-07 14:46:42 -05:00
• 9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single file not used. Don Mitchell 2013-02-07 14:45:24 -05:00
• ed42fa8830 studio - soft landing: revised page title structure and values Brian Talbot 2013-02-07 14:23:00 -05:00
• 9bf53026e6 Tweak box in peer and staff grading views Vik Paruchuri 2013-02-07 14:18:38 -05:00
• 62435b4c27 Clean up results display Vik Paruchuri 2013-02-07 14:12:14 -05:00
• 5b9609abf6 studio - soft landing: various fixes/tweaks Brian Talbot 2013-02-07 14:09:47 -05:00
• 1cf8326b32 Make status bar, minor CSS fixes Vik Paruchuri 2013-02-07 14:03:43 -05:00
• b1726dae99 Fix prompt UI in combined open ended to close by default and be collapsible Vik Paruchuri 2013-02-07 13:48:32 -05:00
• 287715c6ff Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy cahrens 2013-02-07 13:05:52 -05:00
• c907cf756c Add ACE Editors. cahrens 2013-02-07 13:05:39 -05:00
• 5ef4af5afd Fix peer and staff grading interfaces Vik Paruchuri 2013-02-07 12:54:36 -05:00
• ade44c330d Make staff grading interface much nicer Vik Paruchuri 2013-02-07 12:45:08 -05:00
• baba8d3a36 Add collapse action into staff grading view Vik Paruchuri 2013-02-07 12:42:05 -05:00
• 3457b86bd0 Fix JS, style student response box Vik Paruchuri 2013-02-07 12:36:57 -05:00
• 6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav Brian Talbot 2013-02-07 12:35:52 -05:00
• fedd0aac9a studio - course nav: added in styling to account for stateful menus Brian Talbot 2013-02-07 11:25:11 -05:00
• 1c07fae501 Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump David Ormsbee 2013-02-07 08:19:52 -08:00
• b947b88453 Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain David Ormsbee 2013-02-07 08:17:34 -08:00
• 0394e33652 remove CSRF cookie domain setting in aws.py Chris Dodge 2013-02-07 11:15:23 -05:00
• c195fe65cd Restyle rubric list, submission container Vik Paruchuri 2013-02-07 11:10:29 -05:00
• 903115d6a9 studio - soft landing: refined user icon vs. dropdown icon styles Brian Talbot 2013-02-07 11:07:18 -05:00
• bfb411ad3a Merge pull request #1459 from MITx/bug/bug161 Christina Roberts 2013-02-07 07:46:37 -08:00
• 70560d2237 Put DnD back into edit_subsection page Don Mitchell 2013-02-07 10:41:37 -05:00
• 198885f7e0 Move elements around, do some restyling Vik Paruchuri 2013-02-07 10:40:15 -05:00
• aa699905d6 Feedback and view only rubric restyle Vik Paruchuri 2013-02-07 10:32:39 -05:00
• faf7c64ea5 add try/catch and fallback to returning a path to the root of the course Chris Dodge 2013-02-07 10:32:13 -05:00
• f22849ebdd Re-arrange feedback, fix rubric HTML issue Vik Paruchuri 2013-02-07 10:29:58 -05:00
• b30407d7c8 Work on showing results properly Vik Paruchuri 2013-02-07 10:22:33 -05:00
• 2b637fe511 Fix loads of local static files when running in dev mode Calen Pennington 2013-02-07 10:13:53 -05:00
• cab9bfcd55 Minor cleanup Diana Huang 2013-02-07 10:08:34 -05:00
• 12ff015bff Include due date parsing in new versioned xmodule. Diana Huang 2013-02-07 10:00:05 -05:00
• 5674dd19c4 studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS Brian Talbot 2013-02-07 09:58:52 -05:00
• de8e1e9472 Change around some names, restyle rubric Vik Paruchuri 2013-02-07 09:57:41 -05:00
• 277bd0dba6 Documentation update Don Mitchell 2013-02-07 09:50:16 -05:00
• 03a6572bbe Restyle status, get rubric to work properly Vik Paruchuri 2013-02-07 09:49:56 -05:00
• e6957a01a4 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-07 09:44:31 -05:00
• 97655d0358 Remove the requirement that the problem peer grading module has to have a certain naming structure Diana Huang 2013-02-07 09:40:30 -05:00
• 9a5a988116 Revert peer grading problem to master version Vik Paruchuri 2013-02-07 09:29:24 -05:00
• 2542b6cb72 Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui Vik Paruchuri 2013-02-07 09:26:40 -05:00
• 6a6962df9e Alter rubric list, restyle rubric Vik Paruchuri 2013-02-07 09:26:27 -05:00
• 33a5a5fd9f add implementation for fixed_time_module Brian Wilson 2013-02-07 05:17:56 -05:00
• bf17341fdb add select_related("profile") ichuang 2013-02-06 23:16:44 -05:00