Commit Graph

14212 Commits

Author SHA1 Message Date
chrisndodge
891e350a83 Merge pull request #1464 from MITx/bug/bug161
On first request for handouts, create the db record. (bug 160)
2013-02-08 10:49:01 -08:00
Brian Wilson
f51876da6a cosmetic changes 2013-02-08 13:42:54 -05:00
Brian Talbot
210086fed3 studio - settings: grading revamp WIP 2013-02-08 13:42:36 -05:00
Don Mitchell
2cdfed9efe Merge pull request #1472 from MITx/feature/christina/misc2
A couple minor bug fixes.
2013-02-08 10:15:11 -08:00
cahrens
98026e4325 A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Victor Shnayder
a68094515c fix capitalization and spacing 2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6 fix typo; fix phrasing for software engineer job 2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885 Posting lots of new jobs 2013-02-08 12:15:09 -05:00
cahrens
4718c9a51a Forgot to define self when I moved code. 2013-02-08 11:17:02 -05:00
Jay Zoldak
0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
fix test_conditional
2013-02-08 08:13:01 -08:00
chrisndodge
7244425996 Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 08:05:56 -08:00
ichuang
96d119965c limit staff debug verbosity to locations of specific categories 2013-02-08 10:52:03 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
ichuang
04cc257bdd fix module staff accesss - by has_access, not by user.is_staff 2013-02-08 10:46:17 -05:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00
Calen Pennington
bda46c423d Fix some issues that were prevent lms start 2013-02-08 10:41:02 -05:00
Kevin Chugh
727843d32e added cohorted mustache template for inline 2013-02-08 10:39:59 -05:00
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -05:00
ichuang
ad0d304e67 fix instructor dashboard datadump error message to be useful 2013-02-08 09:21:36 -05:00
Kevin Chugh
c6bece8620 more updates 2013-02-08 09:11:41 -05:00
cahrens
950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. 2013-02-08 08:26:24 -05:00
Brian Wilson
ab6f383be1 support for Pearson test user 2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f for starting pearson exam, just call jump_to() instead of reverse(jump_to...) 2013-02-08 02:15:45 -05:00
Arthur Barrett
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). 2013-02-07 19:51:22 -05:00
Vik Paruchuri
17cc6b4dff Fix minor display issue 2013-02-07 19:26:21 -05:00
Vik Paruchuri
a49f740e87 Fix rubric and make images display with tooltips 2013-02-07 19:22:54 -05:00
Kevin Chugh
3cfc5c4545 cohort filter wokorking 2013-02-07 19:18:21 -05:00
Vik Paruchuri
14372a4079 Address some issues with robustness, make images work properly throughout flow 2013-02-07 19:02:01 -05:00
Vik Paruchuri
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 2013-02-07 18:48:13 -05:00
Vik Paruchuri
f5fcd3e1ff Make grader image dict a constant 2013-02-07 18:37:03 -05:00
Vik Paruchuri
4973363353 Attach images to rubric to indicate which graders scored what 2013-02-07 18:35:09 -05:00
Vik Paruchuri
a2d9e66634 Centralized rubric now displays properly 2013-02-07 18:21:50 -05:00
ichuang
7b7b0690b6 fix test_conditional 2013-02-07 18:19:48 -05:00
Your Name
7dd252178c cohort filter almost done 2013-02-07 18:14:46 -05:00
Your Name
3965f9129d cohort filter almost done 2013-02-07 18:13:53 -05:00
Vik Paruchuri
9fa16b07d6 Remove ability to manually get results 2013-02-07 18:02:48 -05:00
Vik Paruchuri
c4bf9a0be4 Modify rubric category rendering 2013-02-07 17:47:19 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Vik Paruchuri
5154068d75 Debug some score tuple issues 2013-02-07 17:33:03 -05:00
Vik Paruchuri
7bf0532a04 Fix some issues with displaying grader info on rubric 2013-02-07 17:28:31 -05:00
Vik Paruchuri
41d35632f3 Working on combined rubric stuff 2013-02-07 17:18:53 -05:00
Don Mitchell
fa5537ab71 On first request for handouts, create the db record. (bug 160) 2013-02-07 17:09:57 -05:00
Vik Paruchuri
0f81b0f816 Aggregate rubric feedback 2013-02-07 16:51:51 -05:00
Vik Paruchuri
47d5fe60ef Return feedback items individually 2013-02-07 16:43:21 -05:00
Vik Paruchuri
091f34668b Support centralized results 2013-02-07 16:40:25 -05:00
Christina Roberts
7f70637331 Merge pull request #1462 from MITx/bug/bug161
bug 171
2013-02-07 13:31:57 -08:00
Victor Shnayder
c81abe1e35 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-07 16:27:08 -05:00
Don Mitchell
48e582647c bug 171 2013-02-07 16:24:43 -05:00
Victor Shnayder
095ec9d3b9 Merge pull request #1457 from MITx/feature/cale/dev-staticfiles
Fix loads of local static files when running in dev mode
2013-02-07 13:23:30 -08:00