Commits · b5508b0123847bed358742662a0972e79d24c550 · edx / edx-platform · GitLab

29 Jan, 2013 40 commits
- Merge branch 'master' into tests/diana/update-oe-unit-tests · b5508b01
  Diana Huang committed Jan 29, 2013
  
  b5508b01 Browse Files
- minor update to new jasmine test · f1973dc6
  Diana Huang committed Jan 29, 2013
  
  f1973dc6 Browse Files
- Merge pull request #1330 from MITx/diana/open-ended-ui-updates · 40d59faa
```
Rubric Integration and other UI improvements
```
  David Ormsbee committed Jan 29, 2013
  40d59faa Browse Files
- Merge pull request #1378 from MITx/feature/jarv/certificate-restriction · 0b9262a4
```
Minor update to embargo text
```
  jarv committed Jan 29, 2013
  0b9262a4 Browse Files
- Minor update to embargo text · 615e6da2
  John Jarvis committed Jan 29, 2013
  
  615e6da2 Browse Files
- Merge branch 'master' into tests/diana/update-oe-unit-tests · f7424eb8
  Diana Huang committed Jan 29, 2013
  
  f7424eb8 Browse Files
- Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule · 3669ea5c
```
Add missing requirejs for xmodule jasmine tests
```
  Jay Zoldak committed Jan 29, 2013
  3669ea5c Browse Files
- Merge pull request #1376 from MITx/fix/zoldak/cms-requirejs · cb66ac71
```
Add RequireJS.js to files.json so that the cms jasmine tests will run 
```
  Calen Pennington committed Jan 29, 2013
  cb66ac71 Browse Files
- Add RequireJS.js to files.json so that the cms jasmine tests will run without… · c3eba0d2
```
Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS.
```
  Jay Zoldak committed Jan 29, 2013
  c3eba0d2 Browse Files
- Merge pull request #1369 from MITx/feature/jarv/certificate-restriction · 877f757f
```
Feature/jarv/certificate restriction
```
  jarv committed Jan 29, 2013
  877f757f Browse Files
- Add missing requirejs for xmodule jasmine tests · cb77209d
  Diana Huang committed Jan 29, 2013
  
  cb77209d Browse Files
- New jasmine tests for combined open ended problems. · 585f1c41
  Diana Huang committed Jan 29, 2013
  
  585f1c41 Browse Files
- Merge pull request #1372 from MITx/feature/dhm/drag · 424cfd3c
```
Auto expand on hover of drag&drop unit
```
  Christina Roberts committed Jan 29, 2013
  424cfd3c Browse Files
- Simple zIndex rather than fancy stack works best. · 574d6e8e
  Don Mitchell committed Jan 29, 2013
  
  574d6e8e Browse Files
- Fix navigation jasmine tests · efc572c2
  Diana Huang committed Jan 29, 2013
  
  efc572c2 Browse Files
- draggable is not the collapsed item :-( but ui.helper seems to be. · 63d269ac
  Don Mitchell committed Jan 29, 2013
  
  63d269ac Browse Files
- subsection drag · 87d8598a
  Don Mitchell committed Jan 29, 2013
  
  87d8598a Browse Files
- Adding dashboard text for certificate restriction · 3f740976
  John Jarvis committed Jan 29, 2013
  
  3f740976 Browse Files
- Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag · b3d7dc77
  Don Mitchell committed Jan 29, 2013
  
  b3d7dc77 Browse Files
- Remove debug code · 5fcb6bfc
  Don Mitchell committed Jan 29, 2013
  
  5fcb6bfc Browse Files
- Auto expand on hover of drag&drop unit · ba95cf23
  Don Mitchell committed Jan 29, 2013
  
  ba95cf23 Browse Files
- Fix courseware jasmine tests · 3f4c4546
  Diana Huang committed Jan 29, 2013
  
  3f4c4546 Browse Files
- Merge pull request #1371 from MITx/victor/cohorts-tweaks · a98c924d
```
make links look like links
```
  David Ormsbee committed Jan 29, 2013
  a98c924d Browse Files
- make links look like links · 39a9c475
  Victor Shnayder committed Jan 29, 2013
  
  39a9c475 Browse Files
- Adding section on eligibility · a9ee71ff
  John Jarvis committed Jan 29, 2013
  
  a9ee71ff Browse Files
- Merge pull request #1368 from MITx/feature/brian/pearson-status · 0a1f5bc1
```
add pearson_dump command.  
```
  David Ormsbee committed Jan 29, 2013
  0a1f5bc1 Browse Files
- add validation of accommodation codes · 15a11e9c
  Brian Wilson committed Jan 29, 2013
  
  15a11e9c Browse Files
- Grade a student even if they are on the restricted list · 3a6d45e7
  John Jarvis committed Jan 29, 2013
  
  3a6d45e7 Browse Files
- Merge pull request #1363 from MITx/marketing/victor · 37b82a66
```
Marketing/victor
```
  Victor Shnayder committed Jan 29, 2013
  37b82a66 Browse Files
- add more validation for countries · 69ff879e
  Brian Wilson committed Jan 29, 2013
  
  69ff879e Browse Files
- Merge pull request #1370 from MITx/feature/cdodge/add-course-about-video-to-xlint · 17930e41
```
imports should have a marketing video. Treat it as a warning as every co...
```
  Don Mitchell committed Jan 29, 2013
  17930e41 Browse Files
- Adding certificate restriction lookup · 0f39e046
```
If certificate status is 'restricted' the grade
and survey link will be shown, the download link will not
```
  John Jarvis committed Jan 29, 2013
  0f39e046 Browse Files
- Adding docstring to CertificateWhitelist model · 4b099993
  John Jarvis committed Jan 29, 2013
  
  4b099993 Browse Files
- renaming whitelist to is_whitelisted · 415ebec8
  John Jarvis committed Jan 29, 2013
  
  415ebec8 Browse Files
- cert_status temporary assignment removed · dbc0f353
  John Jarvis committed Jan 29, 2013
  
  dbc0f353 Browse Files
- fix log message in pearson import · 09ab52bc
  Brian Wilson committed Jan 29, 2013
  
  09ab52bc Browse Files
- imports should have a marketing video. Treat it as a warning as every course might not have one. · 5a4c0fb9
  Chris Dodge committed Jan 29, 2013
  
  5a4c0fb9 Browse Files
- adding more to help string · 289301e0
  John Jarvis committed Jan 28, 2013
  
  289301e0 Browse Files
- command for certificate restriction (embargoed countries) · 0c43e69c
  John Jarvis committed Jan 28, 2013
  
  0c43e69c Browse Files
- Removing whitespace · e9722b25
  John Jarvis committed Jan 28, 2013
  
  e9722b25 Browse Files