Commits · 386ab10edb05d3923bce534c87457b9b762cbd85 · edx / edx-platform · GitLab

01 Mar, 2013 26 commits
- Apparently meld is weird at indenting · 386ab10e
  Vik Paruchuri committed Mar 01, 2013
  
  386ab10e Browse Files
- Fix category generation · a09a4feb
  Vik Paruchuri committed Mar 01, 2013
  
  a09a4feb Browse Files
- Minor bugfixes · fb37d46b
  Vik Paruchuri committed Mar 01, 2013
  
  fb37d46b Browse Files
- Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio · d0397762
```
Conflicts:
	cms/djangoapps/contentstore/views.py
```
  Vik Paruchuri committed Mar 01, 2013
  d0397762 Browse Files
- added advanced component button with ability to specify components in course policy. · 67b73242
  Arthur Barrett committed Mar 01, 2013
  
  67b73242 Browse Files
- Add in some dummy values · 9f020e22
  Vik Paruchuri committed Mar 01, 2013
  
  9f020e22 Browse Files
- Prelim support for combinedopenended and peergrading types · a8181912
  Vik Paruchuri committed Mar 01, 2013
  
  a8181912 Browse Files
- Move self assessment templates · c24ba23e
  Vik Paruchuri committed Mar 01, 2013
  
  c24ba23e Browse Files
- Switch around template locations · b0c2559d
  Vik Paruchuri committed Mar 01, 2013
  
  b0c2559d Browse Files
- Start to move around templates · b3d0abbd
  Vik Paruchuri committed Mar 01, 2013
  
  b3d0abbd 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
- 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
- Update student FAQ (LH #213) · f0a46919
  Victor Shnayder committed Feb 28, 2013
  
  f0a46919 Browse Files
28 Feb, 2013 14 commits
- Merge pull request #1568 from MITx/bug/christina/misc · 1b9d105e
```
Don't require text tag around multiple choice/checkbox answers.
```
  Christina Roberts committed Feb 28, 2013
  1b9d105e Browse Files
- Don't require text tag around multiple choice/checkbox answers. · 2be42b8f
```
https://edx.lighthouseapp.com/projects/102637/tickets/196
```
  cahrens committed Feb 28, 2013
  2be42b8f Browse Files
- Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor · 69ef622a
```
Fix latex high-level source editor in current version of cms / studio
```
  Christina Roberts committed Feb 28, 2013
  69ef622a Browse Files
- Cleaned up admin_dashboard code and template · 02e30f50
  John Hess committed Feb 28, 2013
  
  02e30f50 Browse Files
- Readable admin_dashboard · 2f5e1b9c
  John Hess committed Feb 28, 2013
  
  2f5e1b9c Browse Files
- Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation · 1ebc3b31
```
Fix/cdodge/optimize metadata tree computation
```
  Christina Roberts committed Feb 28, 2013
  1ebc3b31 Browse Files
- Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests · 9429262c
```
Fix/will/capa response unit tests
```
  Diana Huang committed Feb 28, 2013
  9429262c Browse Files
- Merge pull request #1562 from MITx/feature/jarv/org-staff-access · 456972de
```
Creating group for organization staff access DO NOT MERGE
```
  David Ormsbee committed Feb 28, 2013
  456972de Browse Files
- Fixed an error in the JavascriptResponseTest: coffee files · 71d0a367
```
were not being compiled before the LoncapaProblem initializer was
called.
```
  Will Daly committed Feb 28, 2013
  71d0a367 Browse Files
- remove unused import commands (which were used for temporary profiling). Also… · 8a7211da
```
remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument.
```
  Chris Dodge committed Feb 28, 2013
  8a7211da Browse Files
- Merge pull request #1564 from MITx/bug/christina/misc · 38830f00
```
Bug/christina/misc
```
  Don Mitchell committed Feb 28, 2013
  38830f00 Browse Files
- upadte latex2edx url in latex-problem template · 9fe9e2fb
  ichuang committed Feb 28, 2013
  
  9fe9e2fb Browse Files
- address Christina's comments re js in latex2edx source-edit.html · b75ccbdc
  ichuang committed Feb 28, 2013
  
  b75ccbdc Browse Files
- restore metadata inheritance. Fix lms jump computation on the Studio index page.… · 905199b5
```
restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive.
```
  Chris Dodge committed Feb 27, 2013
  905199b5 Browse Files