Commits · ca2eb9cd1b331636799e9b992bcf833746bc8957 · edx / edx-platform · GitLab

10 Apr, 2013 8 commits
- Add in tests for combinedopenended scoring · ca2eb9cd
  Vik Paruchuri committed Apr 10, 2013
  
  ca2eb9cd Browse Files
- Add in js image upload preview · 820a2b40
  Vik Paruchuri committed Apr 10, 2013
  
  820a2b40 Browse Files
- Better confirmation for flagging · 9f04769c
  Vik Paruchuri committed Apr 10, 2013
  
  9f04769c Browse Files
- Add popup when flag box is checked · a64d57ae
  Vik Paruchuri committed Apr 10, 2013
  
  a64d57ae Browse Files
- Code cleanup · 2a5631da
  Vik Paruchuri committed Apr 10, 2013
  
  2a5631da Browse Files
- Display instructor feedback · cef4d0cb
  Vik Paruchuri committed Apr 10, 2013
  
  cef4d0cb Browse Files
- Fix hotkeys for combined open ended · 799c8282
  Vik Paruchuri committed Apr 10, 2013
  
  799c8282 Browse Files
- Fix hotkeys in peer and staff grading to use ctrl prefix · d0ecbbb4
  Vik Paruchuri committed Apr 10, 2013
  
  d0ecbbb4 Browse Files
09 Apr, 2013 10 commits
- Display rubric to students after calibration · 463a88cc
  Vik Paruchuri committed Apr 09, 2013
  
  463a88cc Browse Files
- Remove attempts field from peer grading template · 7d381474
  Vik Paruchuri committed Apr 09, 2013
  
  7d381474 Browse Files
- Fix some templates, minor code reformats · 418f218e
  Vik Paruchuri committed Apr 09, 2013
  
  418f218e Browse Files
- Code reformat, patch score gen · 247ccc37
  Vik Paruchuri committed Apr 09, 2013
  
  247ccc37 Browse Files
- Correctly calculate score for combinedopenended and peer assessment · 112fb453
  Vik Paruchuri committed Apr 09, 2013
  
  112fb453 Browse Files
- Fix file uploads to work after error · 45a3dd4e
  Vik Paruchuri committed Apr 09, 2013
  
  45a3dd4e Browse Files
- Fix skip behavior for staff · 9cca3072
  Vik Paruchuri committed Apr 09, 2013
  
  9cca3072 Browse Files
- Patch combinedopenended to work if self assessment is not first · 448c8121
  Vik Paruchuri committed Apr 09, 2013
  
  448c8121 Browse Files
- Merge pull request #1834 from MITx/bug/christina/base · 2fce096e
```
Need to be able to access smoothScrollTop. 
```
  chrisndodge committed Apr 09, 2013
  2fce096e Browse Files
- Need to be able to access smoothScrollTop. This is a temporary change-- I'll… · f36494e5
```
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
```
  cahrens committed Apr 09, 2013
  f36494e5 Browse Files
08 Apr, 2013 22 commits
- Merge pull request #1831 from MITx/vik/fix/pg-and-progress · 74104d60
```
Fix weighting and score generation
```
  Sarina committed Apr 08, 2013
  74104d60 Browse Files
- Merge pull request #1816 from MITx/feature/btalbot/studio-alerts · 7fd8a33b
```
Feature/btalbot/studio-alerts
```
  Christina Roberts committed Apr 08, 2013
  7fd8a33b Browse Files
- studio - alerts: correcting page title · 78828457
  Brian Talbot committed Apr 08, 2013
  
  78828457 Browse Files
- studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake · 27871ac9
  Brian Talbot committed Apr 08, 2013
  
  27871ac9 Browse Files
- Fix weighting and score generation · 7d09617e
  Vik Paruchuri committed Apr 08, 2013
  
  7d09617e Browse Files
- Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data · 45bb4d37
```
import was putting the xml data into definition.data.data rather than de...
```
  Calen Pennington committed Apr 08, 2013
  45bb4d37 Browse Files
- Merge branch 'master' into feature/btalbot/studio-alerts · 3f2e21f9
  Brian Talbot committed Apr 08, 2013
  
  3f2e21f9 Browse Files
- studio - alerts: adding some ARIA-centric accessibility information to example… · 3f22826e
```
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
```
  Brian Talbot committed Apr 08, 2013
  3f22826e Browse Files
- seems like we need to purge 'filename' from both _model_data as well as xml_attributes · 54afc5eb
  Chris Dodge committed Apr 08, 2013
  
  54afc5eb Browse Files
- wip to fix broken test · a0f5a511
  Chris Dodge committed Apr 08, 2013
  
  a0f5a511 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data · 983e5241
  Chris Dodge committed Apr 08, 2013
  
  983e5241 Browse Files
- fix line breaks per Cale · 0b26cc26
  Chris Dodge committed Apr 08, 2013
  
  0b26cc26 Browse Files
- Merge pull request #1823 from MITx/diana/job-page-update · e981226d
```
Make requested updates to the jobs page
```
  Diana Huang committed Apr 08, 2013
  e981226d Browse Files
- import was putting the xml data into definition.data.data rather than definition.data · 069f9975
  Chris Dodge committed Apr 08, 2013
  
  069f9975 Browse Files
- Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo · 1500586f
```
studio - corrected a typo and adjusted copy on the help sock
```
  Mark L. Chang committed Apr 08, 2013
  1500586f Browse Files
- Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through · 9a405ff4
```
extend the list of container module names to our comuputation of inherit...
```
  chrisndodge committed Apr 08, 2013
  9a405ff4 Browse Files
- studio - corrected a typo and adjusted copy on the help sock · e3a1279c
  Brian Talbot committed Apr 08, 2013
  
  e3a1279c Browse Files
- Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None · caa25398
```
mark stumble on case where he had a None course
```
  Mark L. Chang committed Apr 08, 2013
  caa25398 Browse Files
- mark stumble on case where he had a None course · 472e6576
  Chris Dodge committed Apr 08, 2013
  
  472e6576 Browse Files
- Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage · c14d046d
```
add a simple Studio walkthough to check page loads
```
  Don Mitchell committed Apr 08, 2013
  c14d046d Browse Files
- add a simple Studio walkthough to check page loads · 5137119f
  Chris Dodge committed Apr 08, 2013
  
  5137119f Browse Files
- studio - alerts: removed banners as a design pattern (not using them) and… · bcf47756
```
studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling
```
  Brian Talbot committed Apr 08, 2013
  bcf47756 Browse Files