Commits · 950f5de3cad0d1d0ac875e9850bb8061af7d10f2 · edx / edx-platform · GitLab

08 Feb, 2013 1 commit
- Move getSession() call out of render method to avoid crash on Chrome. · 950f5de3
  cahrens committed Feb 08, 2013
  
  950f5de3 Browse Files
07 Feb, 2013 3 commits
- Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy · 287715c6
  cahrens committed Feb 07, 2013
  
  287715c6 Browse Files
- Add ACE Editors. · c907cf75
  cahrens committed Feb 07, 2013
  
  c907cf75 Browse Files
- Documentation update · 277bd0db
  Don Mitchell committed Feb 07, 2013
  
  277bd0db Browse Files
06 Feb, 2013 20 commits
- Remove from to-be-deleted list any readded keys w/ same name. · 1e68834e
  Don Mitchell committed Feb 06, 2013
  
  1e68834e Browse Files
- did other test cleanups which Christina mentioned (should have read the · 253bc10d
```
note first)
```
  Don Mitchell committed Feb 06, 2013
  253bc10d Browse Files
- blacklist violations now properly trigger violation error · 7b3c81ca
```
delete keys only after save completes
```
  Don Mitchell committed Feb 06, 2013
  7b3c81ca Browse Files
- Update test now updates existing attrs · 7668c70f
  Don Mitchell committed Feb 06, 2013
  
  7668c70f Browse Files
- Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy · 3f15b3b8
  cahrens committed Feb 06, 2013
  
  3f15b3b8 Browse Files
- Move to view file. · c243eec6
  cahrens committed Feb 06, 2013
  
  c243eec6 Browse Files
- studio - manual policy editor: added in example messages for confirm, error, warning · d8a6010d
  Brian Talbot committed Feb 06, 2013
  
  d8a6010d Browse Files
- studio - manual policy editor: styled error states to appear inline with row actions visually · 571e1106
  Brian Talbot committed Feb 06, 2013
  
  571e1106 Browse Files
- Unit tests for edit metadata · 8f18522d
  Don Mitchell committed Feb 06, 2013
  
  8f18522d Browse Files
- Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy · 08ce212b
```
Conflicts:
	cms/static/js/models/settings/advanced.js
```
  cahrens committed Feb 06, 2013
  08ce212b Browse Files
- Catch null pointer for uninitialized dates · 1cc62fae
  Don Mitchell committed Feb 06, 2013
  
  1cc62fae Browse Files
- Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy · 4ba7de34
  Don Mitchell committed Feb 06, 2013
  
  4ba7de34 Browse Files
- Set size of ACE Editor. · 8093de1d
  cahrens committed Feb 06, 2013
  
  8093de1d Browse Files
- Oops, when i alphabetized i got the value incorrectly. · 05ec0c11
```
Fixed cancel to not retain new entries.
```
  Don Mitchell committed Feb 06, 2013
  05ec0c11 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
- Keys are sorted now · 592d7e53
  Don Mitchell committed Feb 06, 2013
  
  592d7e53 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
- Cancel kind of works (reverts but leaves in new fields :-( ) · 5275db9a
```
Filter out system metadata fields
```
  Don Mitchell committed Feb 05, 2013
  5275db9a Browse Files
05 Feb, 2013 16 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
- Also this · 74d37327
  Don Mitchell committed Feb 05, 2013
  
  74d37327 Browse Files
- CRUD on policy fields w/ some validation · 8f16d639
  Don Mitchell committed Feb 05, 2013
  
  8f16d639 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