Commits · 9f5eeaf815bcd0c2a7fb936839525afbc8628622 · edx / edx-platform · GitLab

07 Feb, 2013 8 commits
- Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… · 9f5eeaf8
```
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html
```
  Don Mitchell committed Feb 07, 2013
  9f5eeaf8 Browse Files
- More for that commit · 31393043
  Don Mitchell committed Feb 07, 2013
  
  31393043 Browse Files
- Grading and details split out. Put the unimplemented tabs into a single · 9cd1162a
```
file not used.
```
  Don Mitchell committed Feb 07, 2013
  9cd1162a Browse Files
- studio - soft landing: revised page title structure and values · ed42fa88
  Brian Talbot committed Feb 07, 2013
  
  ed42fa88 Browse Files
- studio - soft landing: various fixes/tweaks · 5b9609ab
  Brian Talbot committed Feb 07, 2013
  
  5b9609ab Browse Files
- studio - course nav: added in styling to account for stateful menus · fedd0aac
  Brian Talbot committed Feb 07, 2013
  
  fedd0aac Browse Files
- studio - soft landing: refined user icon vs. dropdown icon styles · 903115d6
  Brian Talbot committed Feb 07, 2013
  
  903115d6 Browse Files
- studio - soft landing and nav: slight visual tweaks to soft landing UI and added… · 5674dd19
```
studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS
```
  Brian Talbot committed Feb 07, 2013
  5674dd19 Browse Files
06 Feb, 2013 17 commits
- studio - soft landing: style dropdown arrows · cb9d960a
  Brian Talbot committed Feb 06, 2013
  
  cb9d960a Browse Files
- studio - soft landing: resolved not signed in header nav length issue · d00a1f35
  Brian Talbot committed Feb 06, 2013
  
  d00a1f35 Browse Files
- studio - course nav: corrected JS behavior of dropdowns to hide all others and… · d11f10cc
```
studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately
```
  Brian Talbot committed Feb 06, 2013
  d11f10cc Browse Files
- studio - resolving merge conflict in header widget · 946d1617
  Brian Talbot committed Feb 06, 2013
  
  946d1617 Browse Files
- studio - course nav: styled dropdown navigation · 1dae21e9
  Brian Talbot committed Feb 06, 2013
  
  1dae21e9 Browse Files
- Wire up settings to menu (3 different ways just b/c it's possible) · 31d541e5
  Don Mitchell committed Feb 06, 2013
  
  31d541e5 Browse Files
- studio - soft landing: revised app nav flexible grid · b0be1cd3
  Brian Talbot committed Feb 06, 2013
  
  b0be1cd3 Browse Files
- studio - merging soft landing local work with rebased branch · b98c643a
  Brian Talbot committed Feb 06, 2013
  
  b98c643a Browse Files
- studio - course nav: general flex-grid layout - WIP · bb789e75
  Brian Talbot committed Feb 06, 2013
  
  bb789e75 Browse Files
- Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… · 0f5571f4
```
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
```
  Don Mitchell committed Feb 06, 2013
  0f5571f4 Browse Files
- studio - soft landing: fixed flexible grid proportions on sign up/in UI · 280de111
  Brian Talbot committed Feb 06, 2013
  
  280de111 Browse Files
- Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule · 95d39573
```
Patch peer grading tab to work
```
  Diana Huang committed Feb 06, 2013
  95d39573 Browse Files
- studio - soft landing: revised copy · 8c86eb25
  Brian Talbot committed Feb 06, 2013
  
  8c86eb25 Browse Files
- studio - soft landing: added in modal copy and resolved image dimensions issue · 1687a99c
  Brian Talbot committed Feb 06, 2013
  
  1687a99c Browse Files
- Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph · 92f2149d
```
Allow policy.json to disable progress graph
```
  David Ormsbee committed Feb 06, 2013
  92f2149d Browse Files
- add doc about disable_progress_graph · 6a7e30e3
  ichuang committed Feb 06, 2013
  
  6a7e30e3 Browse Files
- add disable_progress_graph key to course metadata · 0936f448
  ichuang committed Feb 06, 2013
  
  0936f448 Browse Files
05 Feb, 2013 15 commits
- Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes · 6b468df5
```
Revert "Fix permissions bug and add test cases for django comment client...
```
  Victor Shnayder committed Feb 05, 2013
  6b468df5 Browse Files
- Revert "Add tests for django-comment-client models" (which actually had · a3a886bd
```
a model change as well)

This reverts commit 05354745.
```
  David Ormsbee committed Feb 05, 2013
  a3a886bd Browse Files
- Revert "Fix permissions bug and add test cases for django comment client permissions." · 119b4206
```
This reverts commit e7450874.
```
  David Ormsbee committed Feb 05, 2013
  119b4206 Browse Files
- studio - soft landing: refined sign in/up error states visually · 56b8353d
  Brian Talbot committed Feb 05, 2013
  
  56b8353d Browse Files
- Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix · 3222e083
```
Fix bug where we imported two functions w/ the same name
```
  Christina Roberts committed Feb 05, 2013
  3222e083 Browse Files
- Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 · 0d8cfb9b
```
change from throwing a Http404 exception, which I believe will try to re...
```
  Christina Roberts committed Feb 05, 2013
  0d8cfb9b Browse Files
- Patch peer grading tab to work · 0133c7c6
  Vik Paruchuri committed Feb 05, 2013
  
  0133c7c6 Browse Files
- Merge pull request #1436 from MITx/debug/dave/sass · b68aff72
```
undo pipeline changes
```
  David Ormsbee committed Feb 05, 2013
  b68aff72 Browse Files
- change from throwing a Http404 exception, which I believe will try to render a… · 3fa1fe0c
```
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
```
  Chris Dodge committed Feb 05, 2013
  3fa1fe0c Browse Files
- re-add compression flag to sass · 1ef9d638
  David Ormsbee committed Feb 05, 2013
  
  1ef9d638 Browse Files
- undo pipeline changes · 706a1072
  David Ormsbee committed Feb 05, 2013
  
  706a1072 Browse Files
- Fix bug where we imported two functions w/ the same name · 8360a7a7
  Calen Pennington committed Feb 05, 2013
  
  8360a7a7 Browse Files
- Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote · 8c4b6612
```
studio - resolved HTML display issue with bold and blockquote
```
  Christina Roberts committed Feb 05, 2013
  8c4b6612 Browse Files
- Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule · 120aa3cd
```
Feature/vik/peer grading xmodule
```
  Diana Huang committed Feb 05, 2013
  120aa3cd Browse Files
- studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style · d713b288
  Brian Talbot committed Feb 05, 2013
  
  d713b288 Browse Files