Commits · 8627a5f33e638c1c4599bcb58fde46d5b2edd369 · edx / edx-platform · GitLab

08 Aug, 2012 2 commits
- Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation · 8627a5f3
  Mike Chen committed Aug 08, 2012
  
  8627a5f3 Browse Files
- limit permissions of a role to courses and fix bugs · b2a048e6
  Mike Chen committed Aug 08, 2012
  
  b2a048e6 Browse Files
07 Aug, 2012 38 commits
- revert permanent link for comments · e9c970e3
  Mike Chen committed Aug 07, 2012
  
  e9c970e3 Browse Files
- left nav styles · 1f1ea8ad
  Brittany Cheng committed Aug 07, 2012
  
  1f1ea8ad Browse Files
- left nav styles · 0fba4d98
  Brittany Cheng committed Aug 07, 2012
  
  0fba4d98 Browse Files
- left nav styles · 67777ef5
  Brittany Cheng committed Aug 07, 2012
  
  67777ef5 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · 8df3ec3d
  Brittany Cheng committed Aug 07, 2012
  
  8df3ec3d Browse Files
- trending tags · 2685a3b6
  Rocky Duan committed Aug 07, 2012
  
  2685a3b6 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · a2f0e31d
  Brittany Cheng committed Aug 07, 2012
  
  a2f0e31d Browse Files
- recent activity · 9ae21a87
  Brittany Cheng committed Aug 07, 2012
  
  9ae21a87 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
- Merge branch 'master' of github.com:dementrock/mitx into brittany · d934142a
  Brittany Cheng committed Aug 07, 2012
  
  d934142a 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
- 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