Vik Paruchuri
|
8bd7b60aca
|
Add in key to mock peer grading service
|
2013-02-04 10:50:07 -05:00 |
|
Vik Paruchuri
|
c991c0489c
|
Fix open ended test with flagging
|
2013-02-04 10:26:25 -05:00 |
|
Vik Paruchuri
|
d9517877a4
|
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
|
2013-02-01 18:32:48 -05:00 |
|
Vik Paruchuri
|
9310dcbe0d
|
Remove reload test
|
2013-02-01 18:31:50 -05:00 |
|
Vik Paruchuri
|
b609bbeeed
|
Fix JS tests
|
2013-02-01 15:36:05 -05:00 |
|
Vik Paruchuri
|
c4b9288c6d
|
Add comment describing why commented out code is there
|
2013-02-01 09:32:29 -05:00 |
|
Vik Paruchuri
|
78dda49764
|
Fix jasmine tests?
|
2013-02-01 09:28:52 -05:00 |
|
Vik Paruchuri
|
c5e80b9543
|
Fix open ended module tests
|
2013-01-31 17:34:33 -05:00 |
|
Vik Paruchuri
|
d6f8def733
|
Move over rubric parsing logic to rubric module
|
2013-01-31 17:18:32 -05:00 |
|
Vik Paruchuri
|
b22bad7fa1
|
Add in some removed imports (fix tests)
|
2013-01-31 17:11:44 -05:00 |
|
Vik Paruchuri
|
5eff483c76
|
Fix max score in combined xmodule tests
|
2013-01-31 17:08:13 -05:00 |
|
Vik Paruchuri
|
524047a11e
|
Fix key error in open ended child
|
2013-01-31 17:06:37 -05:00 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05:00 |
|
Don Mitchell
|
aad5015a82
|
Merge pull request #1398 from MITx/feature/christina/misc2
Fixes date bug (#149).
|
2013-01-31 10:59:07 -08:00 |
|
Don Mitchell
|
fbd9a126ba
|
Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs
add exporting of course info
|
2013-01-31 10:55:45 -08:00 |
|
Christina Roberts
|
5f170d118f
|
Merge pull request #1395 from MITx/bug/dhm/mar13
Remove format field as it's the one for grading type.
|
2013-01-31 10:51:44 -08:00 |
|
Jay Zoldak
|
c590c24e25
|
Add vendor files to files.json for the cms jasmine tests to work.
|
2013-01-31 13:48:38 -05:00 |
|
cahrens
|
b613bdc336
|
Fixes date bug (#149).
|
2013-01-31 13:37:45 -05:00 |
|
Don Mitchell
|
f257f12124
|
Meant to add the file here
|
2013-01-31 12:56:18 -05:00 |
|
Vik Paruchuri
|
f3f509da3b
|
Fix input area styling
|
2013-01-31 12:45:48 -05:00 |
|
Vik Paruchuri
|
a61746609c
|
Fix keyerror
|
2013-01-31 12:18:42 -05:00 |
|
Vik Paruchuri
|
63d4ac8c44
|
Working on some flagging coffeescript
|
2013-01-31 12:17:21 -05:00 |
|
Don Mitchell
|
6491363647
|
Remove format field as it's the one for grading type.
|
2013-01-31 12:11:11 -05:00 |
|
Jay Zoldak
|
6fe209b0cf
|
Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests
New tests for OpenEndedGrading
|
2013-01-31 08:34:06 -08:00 |
|
Vik Paruchuri
|
78f9f63466
|
Add in notification type for flagged submissions
|
2013-01-31 11:19:15 -05:00 |
|
Vik Paruchuri
|
ee06afcb27
|
Possibly fix self assessment tests
|
2013-01-31 11:06:12 -05:00 |
|
Chris Dodge
|
ab9d30cbc6
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs
|
2013-01-31 10:51:24 -05:00 |
|
Chris Dodge
|
fc57e7afdb
|
add testing for course info export. Plus DRY things out a bit
|
2013-01-31 10:51:20 -05:00 |
|
Chris Dodge
|
0d20c192b9
|
add exporting of course info
|
2013-01-31 09:57:07 -05:00 |
|
Diana Huang
|
32524727ce
|
Create a test framework and make it so that we force a mock backend
when we don't have an ajax url
|
2013-01-31 09:00:06 -05:00 |
|
Vik Paruchuri
|
b0e4608558
|
Fix callback alert
|
2013-01-30 21:56:52 -05:00 |
|
Vik Paruchuri
|
2affd4760b
|
Add in wiring for unflag action
|
2013-01-30 21:53:33 -05:00 |
|
Vik Paruchuri
|
b4c80da224
|
Trim whitespace
|
2013-01-30 21:50:24 -05:00 |
|
Vik Paruchuri
|
8e9ec501a7
|
Implement flagging, fix urls
|
2013-01-30 21:44:21 -05:00 |
|
Vik Paruchuri
|
10c7155d4d
|
Add open ended to JS pipeline
|
2013-01-30 21:28:42 -05:00 |
|
Vik Paruchuri
|
4c16479569
|
Working on frontend JS for posting
|
2013-01-30 21:22:59 -05:00 |
|
Vik Paruchuri
|
17fce100bb
|
Add in ban actions to table
|
2013-01-30 21:10:48 -05:00 |
|
Vik Paruchuri
|
b248a09572
|
Work on adding in ban actions
|
2013-01-30 21:06:54 -05:00 |
|
Vik Paruchuri
|
f89e36b5b9
|
Flagged list renders properly
|
2013-01-30 20:54:02 -05:00 |
|
Vik Paruchuri
|
e89196e0dd
|
Add in flagged problem list return
|
2013-01-30 20:47:00 -05:00 |
|
Vik Paruchuri
|
b6f77f6f8e
|
Fix rendering for flagged problems view
|
2013-01-30 20:43:57 -05:00 |
|
Vik Paruchuri
|
dd72297f73
|
Wire up flagged problem list
|
2013-01-30 20:39:53 -05:00 |
|
Vik Paruchuri
|
78696c62b8
|
Work on open ended flagged problems
|
2013-01-30 20:36:09 -05:00 |
|
Vik Paruchuri
|
5f538f078b
|
Pass flag through from LMS to grading controller
|
2013-01-30 19:50:36 -05:00 |
|
Victor Shnayder
|
bc1452f288
|
Merge pull request #1390 from MITx/press/7.00x
7.00x press release
|
2013-01-30 15:35:51 -08:00 |
|
Diana Huang
|
8144a1dfaf
|
Add in next_problem jasmine tests
|
2013-01-30 17:25:13 -05:00 |
|
Calen Pennington
|
76b367e062
|
Merge pull request #1388 from MITx/bug/dhm/mar13
Swallow event calls to squash 404 errors (and remove an unused var in
|
2013-01-30 14:10:02 -08:00 |
|
Don Mitchell
|
756a071634
|
misspelled request (altho as an unused identifier)
|
2013-01-30 17:08:21 -05:00 |
|
Calen Pennington
|
c4f56620df
|
Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
|
2013-01-30 16:49:49 -05:00 |
|
Vik Paruchuri
|
2ba194a4f6
|
Change step names to human names
|
2013-01-30 16:44:40 -05:00 |
|