Commits · f204e9888f9f9c6c7e396b5ce7d0a8000a6e1cb3 · edx / edx-platform · GitLab

01 Aug, 2012 15 commits
- renamed files · f204e988
  Rocky Duan committed Aug 01, 2012
  
  f204e988 Browse Files
- use separate templates for forum view and inline view · 51772c04
  Rocky Duan committed Aug 01, 2012
  
  51772c04 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · 777c3ee4
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/profile.html
```
  Rocky Duan committed Aug 01, 2012
  777c3ee4 Browse Files
- endorse comments · 7d9d790c
  Rocky Duan committed Aug 01, 2012
  
  7d9d790c Browse Files
- fixed histogram bug under staff view · 75c47877
  Rocky Duan committed Aug 01, 2012
  
  75c47877 Browse Files
- Merge pull request #327 from MITx/fix-beautifulsoup4 · 0bfcefd2
```
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
```
  Calen Pennington committed Aug 01, 2012
  0bfcefd2 Browse Files
- Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading · ef8a211b
```
Got profile page working again. 
```
  Calen Pennington committed Aug 01, 2012
  ef8a211b Browse Files
- Got profile page working again. The grader for each course is now defined in the… · ae3da772
```
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
```
  Bridger Maxwell committed Aug 01, 2012
  ae3da772 Browse Files
- Merge pull request #328 from MITx/jarv/dev-script-updates · a2e1409d
```
Jarv/dev script updates
```
  jarv committed Aug 01, 2012
  a2e1409d Browse Files
- trailing whitespace · 94c19059
  John Jarvis committed Aug 01, 2012
  
  94c19059 Browse Files
- removing matplotlib from requirements.txt · 71898e48
  John Jarvis committed Aug 01, 2012
  
  71898e48 Browse Files
- sanity checking /usr/local, updating coffee script install location, old location no longer works · 8c1bb0ca
  John Jarvis committed Aug 01, 2012
  
  8c1bb0ca Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · f637ca51
  Brittany Cheng committed Aug 01, 2012
  
  f637ca51 Browse Files
- Merge pull request #323 from MITx/kimth/lms-coderesponse · b9773b5d
```
Kimth/lms coderesponse
```
  ichuang committed Jul 31, 2012
  b9773b5d Browse Files
- djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4 · 381d2475
  ichuang committed Jul 31, 2012
  
  381d2475 Browse Files
31 Jul, 2012 25 commits
- pulled from origin master · 8023d2b7
  Brittany Cheng committed Jul 31, 2012
  
  8023d2b7 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · f1e07024
  Brittany Cheng committed Jul 31, 2012
  
  f1e07024 Browse Files
- styles again · 33c7336f
  Brittany Cheng committed Jul 31, 2012
  
  33c7336f Browse Files
- Merge pull request #324 from MITx/jarv/dev-script-updates · f0999281
```
Jarv/dev script updates
```
  jarv committed Jul 31, 2012
  f0999281 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · b08ea47b
  John Jarvis committed Jul 31, 2012
  
  b08ea47b Browse Files
- submodules are not on a branch, no need to pull · 0642af01
  John Jarvis committed Jul 31, 2012
  
  0642af01 Browse Files
- removing unnecessary chdir · ecab194e
  John Jarvis committed Jul 31, 2012
  
  ecab194e Browse Files
- betting rvmrc handling · 5c73a6f2
  John Jarvis committed Jul 31, 2012
  
  5c73a6f2 Browse Files
- Merge pull request #325 from MITx/feature/kfiedler/courseware-style · 61fa1184
```
Navigation style and make askbot have style
```
  David Ormsbee committed Jul 31, 2012
  61fa1184 Browse Files
- removing virtualenv install lines that arent needed · 9c31715d
  John Jarvis committed Jul 31, 2012
  
  9c31715d Browse Files
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · 4d1bf530
  John Jarvis committed Jul 31, 2012
  
  4d1bf530 Browse Files
- do not install virtualenv unless it needs to be upgraded (<1.7) · 37ba0395
  John Jarvis committed Jul 31, 2012
  
  37ba0395 Browse Files
- edit tag styles · 72bd3e6d
  Brittany Cheng committed Jul 31, 2012
  
  72bd3e6d Browse Files
- Tweaks to CodeMirror: fix indentation, textarea is vertically resizable · 11495563
  kimth committed Jul 31, 2012
  
  11495563 Browse Files
- Sorta fix askbot · b5b0d086
  Kyle Fiedler committed Jul 31, 2012
  
  b5b0d086 Browse Files
- Added some styles for the top navigation and for the sidebar navigation · 9d14033f
  Kyle Fiedler committed Jul 31, 2012
  
  9d14033f Browse Files
- fix font inheritance, update post control styles · 29d75057
  Brittany Cheng committed Jul 31, 2012
  
  29d75057 Browse Files
- Change absolute paths to relative in scss · f3567ddd
```
* makes collectstatic happy
```
  Victor Shnayder committed Jul 31, 2012
  f3567ddd Browse Files
- Remove obsolete js references · 71b9dbbb
  Victor Shnayder committed Jul 31, 2012
  
  71b9dbbb Browse Files
- always pip install virtualenv · e08cb506
  John Jarvis committed Jul 31, 2012
  
  e08cb506 Browse Files
- adding option back for --system-site-packages, will ensure virtualenv > 1.7 · 09199631
  John Jarvis committed Jul 31, 2012
  
  09199631 Browse Files
- change watch to follow in front end · 84fcb5ef
  Rocky Duan committed Jul 31, 2012
  
  84fcb5ef Browse Files
- adding askbot as a submodule of mitx · 50dc4e80
  John Jarvis committed Jul 31, 2012
  
  50dc4e80 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · c69a4728
  Brittany Cheng committed Jul 31, 2012
  
  c69a4728 Browse Files
- font sizing · b12d8873
  Brittany Cheng committed Jul 31, 2012
  
  b12d8873 Browse Files