Commits · 7f96fbb3d1becf40b295c9c3465d4ef48b5af60e · edx / edx-platform · GitLab

04 Feb, 2013 3 commits
- Address review comments · 7f96fbb3
  Vik Paruchuri committed Feb 04, 2013
  
  7f96fbb3 Browse Files
- Add in key to mock peer grading service · 8bd7b60a
  Vik Paruchuri committed Feb 04, 2013
  
  8bd7b60a Browse Files
- Fix open ended test with flagging · c991c048
  Vik Paruchuri committed Feb 04, 2013
  
  c991c048 Browse Files
01 Feb, 2013 5 commits
- Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging · d9517877
  Vik Paruchuri committed Feb 01, 2013
  
  d9517877 Browse Files
- Remove reload test · 9310dcbe
  Vik Paruchuri committed Feb 01, 2013
  
  9310dcbe Browse Files
- Fix JS tests · b609bbee
  Vik Paruchuri committed Feb 01, 2013
  
  b609bbee Browse Files
- Add comment describing why commented out code is there · c4b9288c
  Vik Paruchuri committed Feb 01, 2013
  
  c4b9288c Browse Files
- Fix jasmine tests? · 78dda497
  Vik Paruchuri committed Feb 01, 2013
  
  78dda497 Browse Files
31 Jan, 2013 32 commits
- Fix open ended module tests · c5e80b95
  Vik Paruchuri committed Jan 31, 2013
  
  c5e80b95 Browse Files
- Move over rubric parsing logic to rubric module · d6f8def7
  Vik Paruchuri committed Jan 31, 2013
  
  d6f8def7 Browse Files
- Add in some removed imports (fix tests) · b22bad7f
  Vik Paruchuri committed Jan 31, 2013
  
  b22bad7f Browse Files
- Fix max score in combined xmodule tests · 5eff483c
  Vik Paruchuri committed Jan 31, 2013
  
  5eff483c Browse Files
- Fix key error in open ended child · 524047a1
  Vik Paruchuri committed Jan 31, 2013
  
  524047a1 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes · 01cdc6e7
```
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
```
  Vik Paruchuri committed Jan 31, 2013
  01cdc6e7 Browse Files
- Merge pull request #1398 from MITx/feature/christina/misc2 · aad5015a
```
Fixes date bug (#149).
```
  Don Mitchell committed Jan 31, 2013
  aad5015a Browse Files
- Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs · fbd9a126
```
add exporting of course info
```
  Don Mitchell committed Jan 31, 2013
  fbd9a126 Browse Files
- Merge pull request #1395 from MITx/bug/dhm/mar13 · 5f170d11
```
Remove format field as it's the one for grading type.
```
  Christina Roberts committed Jan 31, 2013
  5f170d11 Browse Files
- Add vendor files to files.json for the cms jasmine tests to work. · c590c24e
  Jay Zoldak committed Jan 31, 2013
  
  c590c24e Browse Files
- Fixes date bug (#149). · b613bdc3
  cahrens committed Jan 31, 2013
  
  b613bdc3 Browse Files
- Meant to add the file here · f257f121
  Don Mitchell committed Jan 31, 2013
  
  f257f121 Browse Files
- Fix input area styling · f3f509da
  Vik Paruchuri committed Jan 31, 2013
  
  f3f509da Browse Files
- Fix keyerror · a6174660
  Vik Paruchuri committed Jan 31, 2013
  
  a6174660 Browse Files
- Working on some flagging coffeescript · 63d4ac8c
  Vik Paruchuri committed Jan 31, 2013
  
  63d4ac8c Browse Files
- Remove format field as it's the one for grading type. · 64913636
  Don Mitchell committed Jan 31, 2013
  
  64913636 Browse Files
- Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests · 6fe209b0
```
New tests for OpenEndedGrading
```
  Jay Zoldak committed Jan 31, 2013
  6fe209b0 Browse Files
- Add in notification type for flagged submissions · 78f9f634
  Vik Paruchuri committed Jan 31, 2013
  
  78f9f634 Browse Files
- Possibly fix self assessment tests · ee06afcb
  Vik Paruchuri committed Jan 31, 2013
  
  ee06afcb Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs · ab9d30cb
  Chris Dodge committed Jan 31, 2013
  
  ab9d30cb Browse Files
- add testing for course info export. Plus DRY things out a bit · fc57e7af
  Chris Dodge committed Jan 31, 2013
  
  fc57e7af Browse Files
- add exporting of course info · 0d20c192
  Chris Dodge committed Jan 31, 2013
  
  0d20c192 Browse Files
- Create a test framework and make it so that we force a mock backend · 32524727
```
when we don't have an ajax url
```
  Diana Huang committed Jan 31, 2013
  32524727 Browse Files
- Fix callback alert · b0e46085
  Vik Paruchuri committed Jan 30, 2013
  
  b0e46085 Browse Files
- Add in wiring for unflag action · 2affd476
  Vik Paruchuri committed Jan 30, 2013
  
  2affd476 Browse Files
- Trim whitespace · b4c80da2
  Vik Paruchuri committed Jan 30, 2013
  
  b4c80da2 Browse Files
- Implement flagging, fix urls · 8e9ec501
  Vik Paruchuri committed Jan 30, 2013
  
  8e9ec501 Browse Files
- Add open ended to JS pipeline · 10c7155d
  Vik Paruchuri committed Jan 30, 2013
  
  10c7155d Browse Files
- Working on frontend JS for posting · 4c164795
  Vik Paruchuri committed Jan 30, 2013
  
  4c164795 Browse Files
- Add in ban actions to table · 17fce100
  Vik Paruchuri committed Jan 30, 2013
  
  17fce100 Browse Files
- Work on adding in ban actions · b248a095
  Vik Paruchuri committed Jan 30, 2013
  
  b248a095 Browse Files
- Flagged list renders properly · f89e36b5
  Vik Paruchuri committed Jan 30, 2013
  
  f89e36b5 Browse Files