Commits · 272c7b8b0c1d620b1882e6fa5b430b6fe5756075 · edx / edx-platform · GitLab

07 Aug, 2012 35 commits
- Merge branch 'master' into merge · 272c7b8b
  Rocky Duan committed Aug 07, 2012
  
  272c7b8b Browse Files
- trending tags · 2685a3b6
  Rocky Duan committed Aug 07, 2012
  
  2685a3b6 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx · fddee7de
```
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
```
  Rocky Duan committed Aug 07, 2012
  fddee7de Browse Files
- show recently active posts user's following · 7ba3bdfd
  Rocky Duan committed Aug 07, 2012
  
  7ba3bdfd Browse Files
- scaffold for trending tags · 6023aca5
  Rocky Duan committed Aug 07, 2012
  
  6023aca5 Browse Files
- recent activity · 338a6788
  Brittany Cheng committed Aug 07, 2012
  
  338a6788 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · e1a56410
  Brittany Cheng committed Aug 07, 2012
  
  e1a56410 Browse Files
- scaffold for recent active posts · 5309592f
  Rocky Duan committed Aug 07, 2012
  
  5309592f Browse Files
- cleanup css · 39dc6a63
  Brittany Cheng committed Aug 07, 2012
  
  39dc6a63 Browse Files
- error styles · ed8595ad
  Brittany Cheng committed Aug 07, 2012
  
  ed8595ad Browse Files
- info styles · 79628130
  Brittany Cheng committed Aug 07, 2012
  
  79628130 Browse Files
- error handling · 49840933
  Brittany Cheng committed Aug 07, 2012
  
  49840933 Browse Files
- fixed error field for new post · dbb46736
  Rocky Duan committed Aug 07, 2012
  
  dbb46736 Browse Files
- Merge branch 'discussion3' of github.com:dementrock/mitx · aeb2d73c
  Rocky Duan committed Aug 07, 2012
  
  aeb2d73c Browse Files
- Merge branch 'discussion3' of github.com:dementrock/mitx · a9b171c8
```
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
```
  Rocky Duan committed Aug 07, 2012
  a9b171c8 Browse Files
- similar posts styles · 391d1730
  Brittany Cheng committed Aug 07, 2012
  
  391d1730 Browse Files
- add hide similar post button · 0560bb7e
  Rocky Duan committed Aug 07, 2012
  
  0560bb7e Browse Files
- similar posts styles · 4b9358fb
  Brittany Cheng committed Aug 07, 2012
  
  4b9358fb Browse Files
- display actual username · 0863e346
  Rocky Duan committed Aug 07, 2012
  
  0863e346 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion3 · 5bec9646
  Brittany Cheng committed Aug 07, 2012
  
  5bec9646 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · 547114a8
  Rocky Duan committed Aug 07, 2012
  
  547114a8 Browse Files
- to make it appear at least normal.. · 6c2f53a4
  Rocky Duan committed Aug 07, 2012
  
  6c2f53a4 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx · 25c05e70
  Rocky Duan committed Aug 07, 2012
  
  25c05e70 Browse Files
- search for similar posts without any styling.. · 0c311b8f
  Rocky Duan committed Aug 07, 2012
  
  0c311b8f Browse Files
- blank slate · 1fb0e352
  Brittany Cheng committed Aug 07, 2012
  
  1fb0e352 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion3 · 87019c4b
  Brittany Cheng committed Aug 07, 2012
  
  87019c4b Browse Files
- simple blank slate · 77900bd7
  Rocky Duan committed Aug 06, 2012
  
  77900bd7 Browse Files
- make behavior consistent with normal mathjax · 42cab659
  Rocky Duan committed Aug 06, 2012
  
  42cab659 Browse Files
- fixed escape recovering bug · 26a80f2d
  Rocky Duan committed Aug 06, 2012
  
  26a80f2d Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 0ae68e73
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 06, 2012
  0ae68e73 Browse Files
- sort by activity · 5679b0da
  Rocky Duan committed Aug 06, 2012
  
  5679b0da Browse Files
- fixed display mode single character bug · c2e2cd40
  Rocky Duan committed Aug 06, 2012
  
  c2e2cd40 Browse Files
- fixed multiple renderer bug · d33ddec4
  Rocky Duan committed Aug 06, 2012
  
  d33ddec4 Browse Files
- use raw title · fe02d04f
  Rocky Duan committed Aug 06, 2012
  
  fe02d04f Browse Files
- highlighting while skipping code and mathjax (ugly and slow solution) · bd4a386d
  Rocky Duan committed Aug 06, 2012
  
  bd4a386d Browse Files
06 Aug, 2012 5 commits
- Merge pull request #352 from MITx/kimth/lms-coderesponse · 0940a3cc
```
Don't contact queueing server on Django load
```
  kimth committed Aug 06, 2012
  0940a3cc Browse Files
- Don't contact queueing server on Django load · d3f4746f
  kimth committed Aug 06, 2012
  
  d3f4746f Browse Files
- Merge pull request #351 from MITx/edit-link-fix · 926763a3
```
Edit link fix
```
  ichuang committed Aug 06, 2012
  926763a3 Browse Files
- link styles · 92ca7ff2
  Brittany Cheng committed Aug 06, 2012
  
  92ca7ff2 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · 6dfbb222
  ichuang committed Aug 06, 2012
  
  6dfbb222 Browse Files