Kevin Chugh
|
f7ba14ae5e
|
move group logic to get_threads
|
2013-02-04 16:31:28 -05:00 |
|
Vik Paruchuri
|
c9f75f8b3c
|
Add in score return
|
2013-02-04 16:14:34 -05:00 |
|
Brian Talbot
|
b6ae62e303
|
pearson - checking in files Brian W. worked on to resolve weird git issue locally
|
2013-02-04 16:02:28 -05:00 |
|
Christina Roberts
|
2306e7c1e8
|
Merge pull request #1417 from MITx/feature/christina/misc2
Try, try again.
|
2013-02-04 12:56:26 -08:00 |
|
Christina Roberts
|
43c2acdb1f
|
Merge pull request #1416 from MITx/feature/dhm/dnd
Brian's CSS updates.
|
2013-02-04 12:50:36 -08:00 |
|
cahrens
|
aac179f135
|
Try, try again.
|
2013-02-04 15:48:05 -05:00 |
|
Brian Talbot
|
1923ae0d6b
|
pearson - added in timer styling for IE7
|
2013-02-04 15:40:01 -05:00 |
|
Sarina
|
25bede9005
|
Merge pull request #1414 from MITx/feature/victor/showanswer-past-due
Feature/victor/showanswer past due
|
2013-02-04 12:39:13 -08:00 |
|
Brian Wilson
|
f8b7d5fad6
|
have timer redirect when it expires
|
2013-02-04 15:13:14 -05:00 |
|
Victor Shnayder
|
fe42d8e9a8
|
fix typo, add comment
|
2013-02-04 15:04:20 -05:00 |
|
Vik Paruchuri
|
af6123a1ac
|
Add in methods to query data from the controller for student grading
|
2013-02-04 15:00:07 -05:00 |
|
Vik Paruchuri
|
4c5e59e84a
|
Start to fix up instance states
|
2013-02-04 14:52:41 -05:00 |
|
Kevin Chugh
|
3009acbb10
|
showing group names
|
2013-02-04 14:50:53 -05:00 |
|
Brian Talbot
|
ffd585ae56
|
studio - resolved safari/webkit display issue with unit editing window's wrapper background color
|
2013-02-04 14:44:17 -05:00 |
|
Brian Talbot
|
6ca55b8458
|
studio - overview drag and drop: removed unused scss and hid new unit button while dragging
|
2013-02-04 14:35:04 -05:00 |
|
Vik Paruchuri
|
ed282c05d4
|
Proper handling of submissions
|
2013-02-04 14:33:46 -05:00 |
|
Diana Huang
|
7860e013ad
|
Fix unit tests to handle new max score requirements.
|
2013-02-04 14:25:23 -05:00 |
|
Vik Paruchuri
|
6cf2742e32
|
Trim unneeded files
|
2013-02-04 14:22:57 -05:00 |
|
Your Name
|
7a3798f26f
|
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
|
2013-02-04 14:17:02 -05:00 |
|
Vik Paruchuri
|
81b86bb8fe
|
Retrack dev
|
2013-02-04 14:16:26 -05:00 |
|
Vik Paruchuri
|
43ddf1fbcf
|
Proper redirect behavior
|
2013-02-04 14:14:15 -05:00 |
|
Vik Paruchuri
|
14676d1c32
|
Untrack dev.py, add in redirect code for peer grading
|
2013-02-04 14:05:02 -05:00 |
|
Diana Huang
|
85abc43515
|
Add in the ability to handle due dates and grace periods
|
2013-02-04 14:02:42 -05:00 |
|
Vik Paruchuri
|
3380745692
|
About to trim some lines
|
2013-02-04 13:54:27 -05:00 |
|
Christina Roberts
|
517f756ffa
|
Merge pull request #1413 from MITx/feature/christina/misc2
See if this helps with the tab-changing race condition.
|
2013-02-04 10:34:37 -08:00 |
|
cahrens
|
39479d9e18
|
See if this helps with the tab-changing race condition.
|
2013-02-04 13:28:34 -05:00 |
|
Vik Paruchuri
|
c6c89e4216
|
Make peer grading xmodule work with notifications
|
2013-02-04 13:16:05 -05:00 |
|
Diana Huang
|
97a32f8ced
|
Remove extra styling.
|
2013-02-04 12:45:40 -05:00 |
|
Vik Paruchuri
|
7263cbfcca
|
Fixes to make peer grading show up in notifications
|
2013-02-04 12:41:14 -05:00 |
|
Your Name
|
bdfc9d9784
|
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
|
2013-02-04 12:30:48 -05:00 |
|
Christina Roberts
|
be5dd6d25a
|
Merge pull request #1411 from MITx/feature/dhm/dnd
Attempt to patch the dnd hesitation fixes onto master
|
2013-02-04 09:29:07 -08:00 |
|
Victor Shnayder
|
486e747b18
|
Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2
Provides "stop" feature via a new "conditional" XModule
|
2013-02-04 09:20:07 -08:00 |
|
Vik Paruchuri
|
f742b7d865
|
Start to integrate peer grading xmodule back into notifications
|
2013-02-04 12:07:03 -05:00 |
|
jarv
|
723f47f4cc
|
Merge pull request #1412 from MITx/feature/jarv/service-variant-default
Defaulting service_variant to a blank string
|
2013-02-04 09:06:24 -08:00 |
|
Don Mitchell
|
902cdefefa
|
Added comments for unused 2nd arg on generateCheckHoverState
|
2013-02-04 12:05:49 -05:00 |
|
John Jarvis
|
7c39e38539
|
Defaulting service_variant to a blank string
|
2013-02-04 12:05:45 -05:00 |
|
Diana Huang
|
f9cca8befd
|
Starting a framework for handling the closure of an open ended problem.
Currently incomplete.
|
2013-02-04 11:51:05 -05:00 |
|
Don Mitchell
|
50eced5b32
|
Attempt to patch the dnd hesitation fixes onto master
|
2013-02-04 11:34:59 -05:00 |
|
Vik Paruchuri
|
8bd7b60aca
|
Add in key to mock peer grading service
|
2013-02-04 10:50:07 -05:00 |
|
Diana Huang
|
4b59e7d551
|
Fix max score check for the updated rubric UI stuff.
|
2013-02-04 10:34:00 -05:00 |
|
Vik Paruchuri
|
c991c0489c
|
Fix open ended test with flagging
|
2013-02-04 10:26:25 -05:00 |
|
Christina Roberts
|
a6e0fb91ef
|
Merge pull request #1406 from MITx/bug/bug152
Move dnd code from base.js to a js file only loaded by overview.html
|
2013-02-04 06:19:17 -08:00 |
|
Diana Huang
|
f49b5ec771
|
Merge branch 'master' into diana/rubric-ui-improvements
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/self_assessment_module.py
lms/djangoapps/open_ended_grading/grading_service.py
lms/static/sass/course.scss
|
2013-02-04 09:11:28 -05:00 |
|
Diana Huang
|
d4481fa918
|
Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements
|
2013-02-04 09:07:19 -05:00 |
|
Kevin Chugh
|
69225f6435
|
cohort ID showing, have to translate to display text
|
2013-02-04 08:33:33 -05:00 |
|
Brian Wilson
|
1685f302ab
|
add TimerModule to courseware
|
2013-02-04 02:22:24 -05:00 |
|
ichuang
|
ddc8bf2b42
|
add instructor dashboard feature to download profile & problem state
|
2013-02-04 04:47:27 +00:00 |
|
ichuang
|
e59b0b87b1
|
add docs for conditional module; clean up a bit more
|
2013-02-03 21:07:23 -05:00 |
|
ichuang
|
4446ddb292
|
cleaned up conditional module a bit; add test for conditional module
|
2013-02-03 20:59:05 -05:00 |
|
ichuang
|
95ef12169a
|
extend conditional module to add require_attempted
|
2013-02-03 18:53:51 -05:00 |
|