Commits · 3f9bc86c9e1b919d51611953819899ebea3c8387 · edx / edx-platform · GitLab

03 Mar, 2013 3 commits
- need to pass commit parameter · 3f9bc86c
  Chris Dodge committed Mar 02, 2013
  
  3f9bc86c Browse Files
- Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance · f543ad49
```
do the metadata comparison on the parent not the course as we don't actu...
```
  chrisndodge committed Mar 02, 2013
  f543ad49 Browse Files
- do the metadata comparison on the parent not the course as we don't actually… · bcea53d4
```
do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary).
```
  Chris Dodge committed Mar 02, 2013
  bcea53d4 Browse Files
02 Mar, 2013 1 commit
- Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 · 310ecead
```
Feature/kevin/cohorts take 3
```
  Victor Shnayder committed Mar 01, 2013
  310ecead Browse Files
01 Mar, 2013 36 commits
- clean up commments · e1ef6a83
  Your Name committed Mar 01, 2013
  
  e1ef6a83 Browse Files
- new cohorts tested · b7a6eadc
  Your Name committed Mar 01, 2013
  
  b7a6eadc Browse Files
- Merge pull request #1550 from MITx/feature/cdodge/add-test-delete · c236b2c8
```
add another command line argument to allow users to only simulate a dele...
```
  chrisndodge committed Mar 01, 2013
  c236b2c8 Browse Files
- Merge pull request #1578 from MITx/bug/christina/misc · afc2d66d
```
Don't usurp ValidatingView's error handling.
```
  Don Mitchell committed Mar 01, 2013
  afc2d66d Browse Files
- Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base · bba96ee1
```
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
```
  David Ormsbee committed Mar 01, 2013
  bba96ee1 Browse Files
- update usage feedback · 20540fbc
  Chris Dodge committed Mar 01, 2013
  
  20540fbc Browse Files
- Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice · 88bfdd01
```
Feature/will/move correct mark for multiple choice
```
  Victor Shnayder committed Mar 01, 2013
  88bfdd01 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete · 00472956
  Chris Dodge committed Mar 01, 2013
  
  00472956 Browse Files
- Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms · 7fa77769
```
turn on tracking in CMS / Studio
```
  chrisndodge committed Mar 01, 2013
  7fa77769 Browse Files
- reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident. · 724c6c9e
  Chris Dodge committed Mar 01, 2013
  
  724c6c9e Browse Files
- Don't usurp ValidatingView's error handling. · d7c28bfa
```
#219
```
  cahrens committed Mar 01, 2013
  d7c28bfa Browse Files
- Merge pull request #1577 from MITx/bug/christina/misc · 5fa1da53
```
Bug fix for #215 (quotes not rendering in text fields).
```
  Don Mitchell committed Mar 01, 2013
  5fa1da53 Browse Files
- Merge pull request #1576 from MITx/feature/jkarni/newjsme · a204bff2
```
Updated version of JSME.
```
  jkarni committed Mar 01, 2013
  a204bff2 Browse Files
- Removed console.logs · 3203360e
  Julian Arni committed Mar 01, 2013
  
  3203360e Browse Files
- Remove broken link. Will create a record for the general problem of where we… · 29330cc9
```
Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.
#213
```
  cahrens committed Mar 01, 2013
  29330cc9 Browse Files
- Fixed many more broken references in css · b39bbec2
  Julian Arni committed Mar 01, 2013
  
  b39bbec2 Browse Files
- Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. · d001f21b
  cahrens committed Mar 01, 2013
  
  d001f21b Browse Files
- Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime · 11f864f4
```
Limit remembered logins to 7 days, so that old cookies will eventually expire
```
  David Ormsbee committed Mar 01, 2013
  11f864f4 Browse Files
- Fixing broken split-button-arrow-focus link · 6ccd496a
  Julian Arni committed Mar 01, 2013
  
  6ccd496a Browse Files
- Updated version of JSME. · 09ff6235
  Julian Arni committed Mar 01, 2013
  
  09ff6235 Browse Files
- Merge pull request #1538 from MITx/diana/fix-import-export · d186e5d1
```
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
```
  VikParuchuri committed Mar 01, 2013
  d186e5d1 Browse Files
- Merge pull request #1575 from MITx/feature/edz/lock-requirements · 3908ada4
```
locking django-nose and numpy versions
```
  Calen Pennington committed Mar 01, 2013
  3908ada4 Browse Files
- locking django-nose and numpy versions · a3ed2d15
  e0d committed Mar 01, 2013
  
  a3ed2d15 Browse Files
- Merge pull request #1508 from… · d6957f3e
```
Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode

Fix capa save button msgs & add simple capa survey mode
```
  David Ormsbee committed Mar 01, 2013
  d6957f3e Browse Files
- Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries · e1fcf4c3
```
Reduce SQL queries in courseware by model caching a User's groups
```
  David Ormsbee committed Mar 01, 2013
  e1fcf4c3 Browse Files
- Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions · c581ecd8
```
locking deps versions based on pip freeze in production.
```
  Calen Pennington committed Mar 01, 2013
  c581ecd8 Browse Files
- Merge pull request #1567 from MITx/jth/admindash · b400b575
```
Improved /admin_dashboard
```
  John Hess committed Mar 01, 2013
  b400b575 Browse Files
- Fix bug where we weren't combining org_staff with built-in staff for group checking · 1d4defd0
  David Ormsbee committed Mar 01, 2013
  
  1d4defd0 Browse Files
- first pass · 8a953241
  Your Name committed Mar 01, 2013
  
  8a953241 Browse Files
- locking deps versions based on pip freeze in production. · 4e10eb10
  e0d committed Mar 01, 2013
  
  4e10eb10 Browse Files
- Merge branch 'master' into bugfix/dave/too_many_sql_queries · bfe2809a
```
Conflicts:
	lms/djangoapps/courseware/access.py
```
  David Ormsbee committed Mar 01, 2013
  bfe2809a Browse Files
- Remove .redcar folder · 32e5f72c
  Calen Pennington committed Mar 01, 2013
  
  32e5f72c Browse Files
- Merge pull request #1571 from MITx/marketing/faq-and-media · 228e749d
```
add a question about account changes to the help page
```
  VikParuchuri committed Feb 28, 2013
  228e749d Browse Files
- add a question about account changes to the help page · 86b91e2d
  Victor Shnayder committed Feb 28, 2013
  
  86b91e2d Browse Files
- Merge pull request #1570 from MITx/marketing/faq-and-media · 57ea68b2
```
Marketing/faq and media
```
  VikParuchuri committed Feb 28, 2013
  57ea68b2 Browse Files
- Update edX media kit (LH #221) · 9cde21b5
  Victor Shnayder committed Feb 28, 2013
  
  9cde21b5 Browse Files