Commit Graph

14212 Commits

Author SHA1 Message Date
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -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
Deena Wang
7908d87902 more tests for views.py 2013-01-31 15:58:14 -05:00
cahrens
d52be03446 Add ACE Editor (contents of src-min-noconflict).
last commit: 75ba742f4f00cefadfef1ae451cfb2a4280ad367

 package 01.27.2013
2013-01-31 14:52:06 -05:00
cahrens
c956555da4 Note the codemirror version. 2013-01-31 14:50:21 -05:00
Deena Wang
abc3e5b09d more tests in test_views.py 2013-01-31 14:47:59 -05:00
Diana Huang
2e0f90081e Make rubric cleaner and visually simpler 2013-01-31 14:23:17 -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
Diana Huang
683976d7ad Add scores to the top of the rubric, remove from individual cells 2013-01-31 13:28:19 -05:00
Diana Huang
309ac7aa5c Refactor rubric CSS into a single file. 2013-01-31 13:27:46 -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
Don Mitchell
279747ab14 Fixed missing jasmine includes 2013-01-31 12:40:05 -05:00
Victor Shnayder
6088a926cc Add showanswer="past_due" and tests 2013-01-31 12:34:43 -05:00
Victor Shnayder
ea091a6eb8 Add tests for showanswer 2013-01-31 12:34:42 -05:00
Victor Shnayder
025b074b87 Add simple test for showanswer, fix test_system 2013-01-31 12:34:42 -05:00
Victor Shnayder
e41172d55d Add start of test framework for capa 2013-01-31 12:34:41 -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
Victor Shnayder
e0fb906c06 add note about potential bug in verticals. No time to investigate at the moment... 2013-01-31 12:14:20 -05:00
Victor Shnayder
e431378f46 Add first pass at a randomize module 2013-01-31 12:14:01 -05:00
Don Mitchell
6491363647 Remove format field as it's the one for grading type. 2013-01-31 12:11:11 -05:00
Brian Talbot
7d871ddfc9 studio - revised manual policy UI: added key tips on focus, moved error messages to bottom of pairings 2013-01-31 11:50:07 -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
Victor Shnayder
ada9ff7f27 Fix randomization bug in capa.
(Note: capa_problem was still doing randomization internally, but now it does what's actually intended)
2013-01-31 10:45:11 -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
Brian Talbot
0e17d16dbe studio - advanced settings - added in several more static states and firmed up key/value pair styling specifically 2013-01-30 20:02:45 -05:00
Vik Paruchuri
5f538f078b Pass flag through from LMS to grading controller 2013-01-30 19:50:36 -05:00