Commits · 5b6e3997afddc4b3267455c160c8310bbe016fd4 · edx / edx-platform · GitLab

11 Aug, 2012 2 commits
- fixed ul courseware · 5b6e3997
  Brittany Cheng committed Aug 10, 2012
  
  5b6e3997 Browse Files
- merge tom's styles · f44358ab
  Brittany Cheng committed Aug 10, 2012
  
  f44358ab Browse Files
08 Aug, 2012 5 commits
- added admin controls to main post and comments · 5c14a1ce
  Tom Giannattasio committed Aug 08, 2012
  
  5c14a1ce Browse Files
- tightened white space; fixed double margin in comments · 9b9bb22c
  Tom Giannattasio committed Aug 08, 2012
  
  9b9bb22c Browse Files
- merge tom's styles, warning: LOTS OF STUFF BROKE · 3ec658df
  Brittany Cheng committed Aug 08, 2012
  
  3ec658df Browse Files
- placeholder and button color updates · dc5b8b51
  Tom Giannattasio committed Aug 08, 2012
  
  dc5b8b51 Browse Files
- discussion sidebar additions; inline text editor example · 10ff6af3
  Tom Giannattasio committed Aug 08, 2012
  
  10ff6af3 Browse Files
07 Aug, 2012 33 commits
- 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
- added collapsed state for text editor · d6e969a8
  Tom Giannattasio committed Aug 07, 2012
  
  d6e969a8 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
- label font changes · 6295bc3b
  Tom Giannattasio committed Aug 07, 2012
  
  6295bc3b Browse Files
- error styles · ed8595ad
  Brittany Cheng committed Aug 07, 2012
  
  ed8595ad Browse Files
- tweaking the text editor · 8c366e2d
  Tom Giannattasio committed Aug 07, 2012
  
  8c366e2d 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
- thread updates: follow/unfollow, grid tweaks · d5302a0b
  Tom Giannattasio committed Aug 07, 2012
  
  d5302a0b 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
- updated thread styles: voting, actions, comments, sort · 00a72cf8
  Tom Giannattasio committed Aug 07, 2012
  
  00a72cf8 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx · 25c05e70
  Rocky Duan committed Aug 07, 2012
  
  25c05e70 Browse Files