Commits · 30104979e707de2e506ee0cc15e846c76b59c98f · edx / edx-platform · GitLab

22 Apr, 2013 7 commits
- fix downvoting url · 30104979
  Your Name committed Apr 22, 2013
  
  30104979 Browse Files
- gentler url diff · af1c411d
  Your Name committed Apr 22, 2013
  
  af1c411d Browse Files
- restore accidentally deleted chunk · b8114b9e
  Your Name committed Apr 22, 2013
  
  b8114b9e Browse Files
- minimize diff by restoring function locations · 8a02001a
  Your Name committed Apr 22, 2013
  
  8a02001a Browse Files
- remove double Comment from merge conflict · 38502617
  Your Name committed Apr 22, 2013
  
  38502617 Browse Files
- fix merge conflicts · 0bcef4dd
  Your Name committed Apr 22, 2013
  
  0bcef4dd Browse Files
- pep8 fixes · 7994e1b3
  Your Name committed Apr 22, 2013
  
  7994e1b3 Browse Files
21 Apr, 2013 6 commits
- remove whitespace · bb12cdf6
  Kevin Chugh committed Apr 21, 2013
  
  bb12cdf6 Browse Files
- fix git mangle take 3 · bee25f3b
  Kevin Chugh committed Apr 21, 2013
  
  bee25f3b Browse Files
- fix git mangle take 2 · 9d57f0a9
  Kevin Chugh committed Apr 21, 2013
  
  9d57f0a9 Browse Files
- fix indentation · 7bc75844
  Kevin Chugh committed Apr 21, 2013
  
  7bc75844 Browse Files
- Merge branch 'master' into feature/kevin/flagging · e8c64614
  Kevin Chugh committed Apr 21, 2013
  
  e8c64614 Browse Files
- unify flag moderator permissions · 649578ea
  Kevin Chugh committed Apr 21, 2013
  
  649578ea Browse Files
19 Apr, 2013 1 commit
- update permissions for flagging · 0a627bb5
  Your Name committed Apr 19, 2013
  
  0a627bb5 Browse Files
18 Apr, 2013 8 commits
- Merge pull request #1874 from MITx/fix/zoldak/upgrade-lettuce · 4615f0d8
```
Upgrade lettuce and factory boy versions, fix CMS lettuce tests to run under phantomjs or tag them to skip
```
  Will Daly committed Apr 18, 2013
  4615f0d8 Browse Files
- Consolidate and upgrade factories · be76f731
  Jay Zoldak committed Apr 18, 2013
  
  be76f731 Browse Files
- Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now. · 29ce700d
  Jay Zoldak committed Apr 18, 2013
  
  29ce700d Browse Files
- Update lettuce and factory-boy versions. · 0426761b
  Jay Zoldak committed Apr 18, 2013
  
  0426761b Browse Files
- Fix or skip lettuce tests to run under phantomjs and firefox · 8a852f90
  Jay Zoldak committed Apr 18, 2013
  
  8a852f90 Browse Files
- Refactor choosing the browser for lettuce tests to settings.py · 8a2d08bb
  Jay Zoldak committed Apr 18, 2013
  
  8a2d08bb Browse Files
- Merge pull request #1872 from MITx/feature/will/textline_template_test · 584bb862
```
Feature/will/textline template test
```
  Will Daly committed Apr 18, 2013
  584bb862 Browse Files
- Pep8 fixes · a4717aca
  Will Daly committed Apr 18, 2013
  
  a4717aca Browse Files
17 Apr, 2013 18 commits
- Rebased to master · a57a093e
  Will Daly committed Apr 17, 2013
  
  a57a093e Browse Files
- Added test for textline input template · 841d3484
  Will Daly committed Apr 17, 2013
  
  841d3484 Browse Files
- Merge pull request #1865 from MITx/feature/will/more_capa_tests · e5e0dc4b
```
Feature/will/more capa tests
```
  Will Daly committed Apr 17, 2013
  e5e0dc4b Browse Files
- Tested additional values of rerandomize (true/false/per_student) · 52c2f3ae
```
Pylint fixes
```
  Will Daly committed Apr 17, 2013
  52c2f3ae Browse Files
- Added tests for ChoiceGroup template · 754d1eb7
  Will Daly committed Apr 17, 2013
  
  754d1eb7 Browse Files
- Added test for "radio" choicegroup · b42c4dac
  Will Daly committed Apr 17, 2013
  
  b42c4dac Browse Files
- Merge pull request #1869 from MITx/fix/btalbot/studio-courseemail · a3233b67
```
Fix/btalbot/studio courseemail
```
  Christina Roberts committed Apr 17, 2013
  a3233b67 Browse Files
- quick fix to email copy · 0f26be2f
  Mark L. Chang committed Apr 17, 2013
  
  0f26be2f Browse Files
- copy changes, link text change · 44bf60d2
  Mark L. Chang committed Apr 17, 2013
  
  44bf60d2 Browse Files
- studio - reverting back to https references in the course mailto link and url display · 423fa478
  Brian Talbot committed Apr 17, 2013
  
  423fa478 Browse Files
- studio - changed https to http in course mailto link and added that prefix to link displayed · b115ad46
  Brian Talbot committed Apr 17, 2013
  
  b115ad46 Browse Files
- studio - prefixed course URL with https: for individual share course mailto link on settings · 33ba38b8
  Brian Talbot committed Apr 17, 2013
  
  33ba38b8 Browse Files
- studio - adding in course name value in the share course mailto link · c4e4f733
  Brian Talbot committed Apr 17, 2013
  
  c4e4f733 Browse Files
- Merge pull request #1866 from MITx/feature/cale/enable-rednose · d4df9eeb
```
Enable test colors in nosetests
```
  Calen Pennington committed Apr 17, 2013
  d4df9eeb Browse Files
- Add documentation of the setup.cfg flag for pdb · 73f5dc1c
  Calen Pennington committed Apr 17, 2013
  
  73f5dc1c Browse Files
- Disable pdb by default when running tests · 9f158774
  Calen Pennington committed Apr 17, 2013
  
  9f158774 Browse Files
- Merge pull request #1867 from MITx/fix/cale/pep8-violations · 9fff26cf
```
Fix pep8 violations
```
  Jay Zoldak committed Apr 17, 2013
  9fff26cf Browse Files
- Fix pep8 violations · 6c7c49e6
  Calen Pennington committed Apr 17, 2013
  
  6c7c49e6 Browse Files