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 |
|
Brian Talbot
|
dc07e7375f
|
studio - settings: revamp of tabs to views WIP
|
2013-02-08 09:36:18 -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 |
|
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 |
|
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 |
|
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 |
|
John Hess
|
f39a98f9ba
|
Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading
This reverts commit 2627a2f12c.
|
2013-02-07 16:14:42 -05:00 |
|
Vik Paruchuri
|
4b5457c997
|
Fixing some rubric score errors
|
2013-02-07 16:13:07 -05:00 |
|
Brian Wilson
|
80e4944314
|
minor cleanup
|
2013-02-07 16:12:02 -05:00 |
|
Brian Wilson
|
2974b9eec3
|
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
|
2013-02-07 15:58:12 -05:00 |
|
Brian Wilson
|
cc11dc2aa3
|
switch to using timelimit module for Pearson test
|
2013-02-07 15:57:43 -05:00 |
|
Vik Paruchuri
|
4a897d4e7f
|
Save rubric scores in self assessment
|
2013-02-07 15:52:23 -05:00 |
|
Vik Paruchuri
|
3874fe545a
|
Working on making a combined rubric
|
2013-02-07 15:46:49 -05:00 |
|
Ned Batchelder
|
3ccbd504aa
|
Pillow needs libjpeg-dev to build JPG support.
|
2013-02-07 15:20:42 -05:00 |
|
Don Mitchell
|
9f5eeaf815
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/templates/settings.html
cms/templates/widgets/header.html
|
2013-02-07 14:56:48 -05:00 |
|
Julian Arni
|
8a75e1ad19
|
Added comment
|
2013-02-07 14:50:18 -05:00 |
|
Don Mitchell
|
31393043d0
|
More for that commit
|
2013-02-07 14:46:42 -05:00 |
|
Don Mitchell
|
9cd1162a60
|
Grading and details split out. Put the unimplemented tabs into a single
file not used.
|
2013-02-07 14:45:24 -05:00 |
|
Brian Talbot
|
ed42fa8830
|
studio - soft landing: revised page title structure and values
|
2013-02-07 14:23:00 -05:00 |
|
Vik Paruchuri
|
9bf53026e6
|
Tweak box in peer and staff grading views
|
2013-02-07 14:18:38 -05:00 |
|
Vik Paruchuri
|
62435b4c27
|
Clean up results display
|
2013-02-07 14:12:14 -05:00 |
|
Brian Talbot
|
5b9609abf6
|
studio - soft landing: various fixes/tweaks
|
2013-02-07 14:09:47 -05:00 |
|
Vik Paruchuri
|
1cf8326b32
|
Make status bar, minor CSS fixes
|
2013-02-07 14:03:43 -05:00 |
|
Vik Paruchuri
|
b1726dae99
|
Fix prompt UI in combined open ended to close by default and be collapsible
|
2013-02-07 13:48:32 -05:00 |
|
cahrens
|
287715c6ff
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
|
2013-02-07 13:05:52 -05:00 |
|
cahrens
|
c907cf756c
|
Add ACE Editors.
|
2013-02-07 13:05:39 -05:00 |
|