Commits · 2d256dfe1d3477511fc0d321c48dab05b86df9fa · edx / edx-platform · GitLab

11 Aug, 2012 9 commits
- attempt to fix sort · 2d256dfe
  Rocky Duan committed Aug 11, 2012
  
  2d256dfe Browse Files
- fixed endorse&edit&delete · 7030d1f1
  Rocky Duan committed Aug 11, 2012
  
  7030d1f1 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom · 2f469f0f
  Rocky Duan committed Aug 10, 2012
  
  2f469f0f Browse Files
- make some indentation · 39590116
  Rocky Duan committed Aug 10, 2012
  
  39590116 Browse Files
- fix comment styles · 78ca885b
  Brittany Cheng committed Aug 10, 2012
  
  78ca885b Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into lol · 66beb547
  Rocky Duan committed Aug 10, 2012
  
  66beb547 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into lol · ab6cf914
```
Conflicts:
	lms/templates/discussion/_thread.html
```
  Rocky Duan committed Aug 10, 2012
  ab6cf914 Browse Files
- 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 16 commits
- added admin controls to main post and comments · 5c14a1ce
  Tom Giannattasio committed Aug 08, 2012
  
  5c14a1ce Browse Files
- Merge branch 'ccp0101/moderation' into lol · 65f84963
```
Conflicts:
	lms/urls.py
```
  Rocky Duan committed Aug 08, 2012
  65f84963 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · c4538854
  Rocky Duan committed Aug 08, 2012
  
  c4538854 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
- fix MITx master bug in courseware. · 2b803b02
  Mike Chen committed Aug 08, 2012
  
  2b803b02 Browse Files
- courseware still not working.. · 5e6261eb
  Mike Chen committed Aug 08, 2012
  
  5e6261eb Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation · 8627a5f3
  Mike Chen committed Aug 08, 2012
  
  8627a5f3 Browse Files
- placeholder and button color updates · dc5b8b51
  Tom Giannattasio committed Aug 08, 2012
  
  dc5b8b51 Browse Files
- Merge branch 'hotfix/1.0.4' · 80b8529f
```
Conflicts:
	common/djangoapps/util/middleware.py
```
  Calen Pennington committed Aug 08, 2012
  80b8529f Browse Files
- discussion sidebar additions; inline text editor example · 10ff6af3
  Tom Giannattasio committed Aug 08, 2012
  
  10ff6af3 Browse Files
- Merge branch 'ccp0101/moderation' into lol · 2e45b8c3
  Rocky Duan committed Aug 08, 2012
  
  2e45b8c3 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · b1e1cd57
  Rocky Duan committed Aug 08, 2012
  
  b1e1cd57 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · 18fcdc4b
  Rocky Duan committed Aug 08, 2012
  
  18fcdc4b Browse Files
- limit permissions of a role to courses and fix bugs · b2a048e6
  Mike Chen committed Aug 08, 2012
  
  b2a048e6 Browse Files
- Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery · ebd0458d
```
improve staff_problem_info jquery, so the histogram is also toggled
```
  Calen Pennington committed Aug 08, 2012
  ebd0458d Browse Files
07 Aug, 2012 15 commits
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol · f1dabe15
  Rocky Duan committed Aug 07, 2012
  
  f1dabe15 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into brittany · f3d44225
  Rocky Duan committed Aug 07, 2012
  
  f3d44225 Browse Files
- fixed merge bugs · 690d97f2
  Rocky Duan committed Aug 07, 2012
  
  690d97f2 Browse Files
- revert permanent link for comments · e9c970e3
  Mike Chen committed Aug 07, 2012
  
  e9c970e3 Browse Files
- improve staff_problem_info jquery, so the histogram is also toggled · 92418411
  ichuang committed Aug 07, 2012
  
  92418411 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 2fb02f1a
```
Conflicts:
	lms/urls.py
```
  Rocky Duan committed Aug 07, 2012
  2fb02f1a 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' into merge · 272c7b8b
  Rocky Duan committed Aug 07, 2012
  
  272c7b8b 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