Commits · 9bc8dbd7ca3517dfb8ad8b5d8ada65ba0928e019 · edx / edx-platform · GitLab

20 Feb, 2013 40 commits
- Fix location strings, re-order checkboxes · 9bc8dbd7
  Vik Paruchuri committed Feb 20, 2013
  
  9bc8dbd7 Browse Files
- Fix an import statement · 7b604aa0
  Vik Paruchuri committed Feb 20, 2013
  
  7b604aa0 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages · 051b7fd2
  Vik Paruchuri committed Feb 20, 2013
  
  051b7fd2 Browse Files
- Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages · 43158de9
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
```
  Vik Paruchuri committed Feb 20, 2013
  43158de9 Browse Files
- Fix self assessment tests · c55f9970
  Vik Paruchuri committed Feb 20, 2013
  
  c55f9970 Browse Files
- Fix location string object problems · 912800ca
  Vik Paruchuri committed Feb 20, 2013
  
  912800ca Browse Files
- Remove render to string import · a8fadb0e
  Vik Paruchuri committed Feb 20, 2013
  
  a8fadb0e Browse Files
- Merge pull request #1525 from MITx/press/international · bf454382
```
Press/international
```
  Victor Shnayder committed Feb 20, 2013
  bf454382 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages · 19a80c62
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
```
  Vik Paruchuri committed Feb 20, 2013
  19a80c62 Browse Files
- Merge pull request #1524 from MITx/feature/vik/check-if-submission-allowed · cf7a34ae
```
Feature/vik/check if submission allowed
```
  Diana Huang committed Feb 20, 2013
  cf7a34ae Browse Files
- Merge branch 'press/international' of github.com:MITx/mitx into press/international · 4d643d36
  Victor Shnayder committed Feb 20, 2013
  
  4d643d36 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed · d5ba5457
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
```
  Vik Paruchuri committed Feb 20, 2013
  d5ba5457 Browse Files
- Merge pull request #1523 from MITx/style/btalbot/studio-newsection · 1f0c84ed
```
studio - fixed alignment of new section field and controls
```
  Christina Roberts committed Feb 20, 2013
  1f0c84ed Browse Files
- studio - fixed alignment of new section field and controls · 8b5f088e
  Brian Talbot committed Feb 20, 2013
  
  8b5f088e Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages · ad9400a0
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
```
  Vik Paruchuri committed Feb 20, 2013
  ad9400a0 Browse Files
- Actually display ETA message · 26a2e059
  Vik Paruchuri committed Feb 20, 2013
  
  26a2e059 Browse Files
- Render to string fix, display ETA message when student submits · 111ef30f
  Vik Paruchuri committed Feb 20, 2013
  
  111ef30f Browse Files
- Finish function to get eta value · 2f29d85e
  Vik Paruchuri committed Feb 20, 2013
  
  2f29d85e Browse Files
- Move controller query service to xmodule side to prepare for ETA message displays · 59b2f2cc
  Vik Paruchuri committed Feb 20, 2013
  
  59b2f2cc Browse Files
- edx.org - university pages' main banner images are now centered when window resizes · d0fca477
  Brian Talbot committed Feb 20, 2013
  
  d0fca477 Browse Files
- Merge pull request #1519 from MITx/diana/fix-self-assessment-test · fbce67a8
```
Fix test so we don't have to skip it anymore.
```
  VikParuchuri committed Feb 20, 2013
  fbce67a8 Browse Files
- Merge pull request #1518 from MITx/press/international · d2e97d23
```
Press/international
```
  Victor Shnayder committed Feb 20, 2013
  d2e97d23 Browse Files
- Add lower case urls for universities. · 1ae06a45
```
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
  because the proper urls are prettier
```
  Victor Shnayder committed Feb 20, 2013
  1ae06a45 Browse Files
- Merge branch 'master' into diana/fix-self-assessment-test · a789d6c3
  Diana Huang committed Feb 20, 2013
  
  a789d6c3 Browse Files
- Clean up and fix some peer grading tests. · 6e453c2b
  Diana Huang committed Feb 20, 2013
  
  6e453c2b Browse Files
- Fix error message · c3d485a6
  Vik Paruchuri committed Feb 20, 2013
  
  c3d485a6 Browse Files
- Fix eta message slightly · 3db3d7b7
  Vik Paruchuri committed Feb 20, 2013
  
  3db3d7b7 Browse Files
- Add in support for getting and displaying ETA · 59e36476
  Vik Paruchuri committed Feb 20, 2013
  
  59e36476 Browse Files
- Merge pull request #1520 from MITx/feature/vik/disable-spell-check · 789db301
```
Feature/vik/disable spell check
```
  Diana Huang committed Feb 20, 2013
  789db301 Browse Files
- Fix tests · dbe93502
  Vik Paruchuri committed Feb 20, 2013
  
  dbe93502 Browse Files
- Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed · 2302c324
  Vik Paruchuri committed Feb 20, 2013
  
  2302c324 Browse Files
- Fix SA tests · c48998b3
  Vik Paruchuri committed Feb 20, 2013
  
  c48998b3 Browse Files
- Fix tests · 7be76fe1
  Vik Paruchuri committed Feb 20, 2013
  
  7be76fe1 Browse Files
- Merge pull request #1458 from MITx/feature/diana/close-oe-problems · 4673c739
```
Support due dates for Peer Grading XModule
```
  VikParuchuri committed Feb 20, 2013
  4673c739 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check · ee3c658f
  Vik Paruchuri committed Feb 20, 2013
  
  ee3c658f Browse Files
- Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into… · eefe8749
```
Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems
```
  Diana Huang committed Feb 20, 2013
  eefe8749 Browse Files
- Fix import statement for TimeInfo · d0bd7466
  Diana Huang committed Feb 20, 2013
  
  d0bd7466 Browse Files
- Merge branch 'master' into feature/diana/close-oe-problems · b3767fc5
```
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
```
  Diana Huang committed Feb 20, 2013
  b3767fc5 Browse Files
- Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule · 03a4deb8
```
Feature/vik/settings to xmodule
```
  Diana Huang committed Feb 20, 2013
  03a4deb8 Browse Files
- Fix test so we don't have to skip it anymore. · e467c057
  Diana Huang committed Feb 20, 2013
  
  e467c057 Browse Files