Commits · 9475c6edacff878dbf3d56157dda6359b0d44312 · edx / edx-platform · GitLab

05 Mar, 2013 6 commits
- Address review comments · 9475c6ed
  Vik Paruchuri committed Mar 05, 2013
  
  9475c6ed Browse Files
- Advanced modules must now be specified individually in order to enable them on… · 5bbb70ef
```
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
```
  Arthur Barrett committed Mar 05, 2013
  5bbb70ef Browse Files
- updated CSS to use the new advanced icon · c9b2a6a2
  Arthur Barrett committed Mar 05, 2013
  
  c9b2a6a2 Browse Files
- merged openended and advanced categories per discussion at today's standup · fa3961d4
  Arthur Barrett committed Mar 05, 2013
  
  fa3961d4 Browse Files
- studio - advanced modules: added in advanced module button icon per artie/vik work · ef9f963f
  Brian Talbot committed Mar 05, 2013
  
  ef9f963f Browse Files
- Small metadata naming fix · d03fe79e
  Vik Paruchuri committed Mar 05, 2013
  
  d03fe79e Browse Files
04 Mar, 2013 1 commit
- studio - open ended and annotations: added in component button icon assets and styling · cc3b9557
  Brian Talbot committed Mar 04, 2013
  
  cc3b9557 Browse Files
01 Mar, 2013 32 commits
- Add in a todo · 7ee58fb2
  Vik Paruchuri committed Mar 01, 2013
  
  7ee58fb2 Browse Files
- Fix the way that peer grading tab is initialized to make it work with studio · 55e19f82
  Vik Paruchuri committed Mar 01, 2013
  
  55e19f82 Browse Files
- Fix some xml issues in yaml · 4400f941
  Vik Paruchuri committed Mar 01, 2013
  
  4400f941 Browse Files
- Change name of annotatable, add in sass for advanced module · f8b0338d
  Vik Paruchuri committed Mar 01, 2013
  
  f8b0338d Browse Files
- Make parsing more robust · a2c03fec
  Vik Paruchuri committed Mar 01, 2013
  
  a2c03fec Browse Files
- Json parsing fixes · 7a8e43a9
  Vik Paruchuri committed Mar 01, 2013
  
  7a8e43a9 Browse Files
- 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 1 commit
- 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