Commits · 9d3c9e333ff380005ab44da09760d9e646566469 · edx / edx-platform · GitLab

14 Aug, 2012 6 commits
- fixed tag autocomplete · 9d3c9e33
  Rocky Duan committed Aug 13, 2012
  
  9d3c9e33 Browse Files
- fixed updating bug · 1f4d2f3d
  Rocky Duan committed Aug 13, 2012
  
  1f4d2f3d Browse Files
- reply now works again · 38bdcabe
  Rocky Duan committed Aug 13, 2012
  
  38bdcabe Browse Files
- fixed focus bug: mistakenly binded event twice · 19ba5785
  Rocky Duan committed Aug 13, 2012
  
  19ba5785 Browse Files
- make retrieved single thread/comment after update integrated with permissions · 6fa02985
  Rocky Duan committed Aug 13, 2012
  
  6fa02985 Browse Files
- add cancel button for new post · 0fa0f2c8
  Rocky Duan committed Aug 13, 2012
  
  0fa0f2c8 Browse Files
13 Aug, 2012 9 commits
- hide empty brackets when not filtering through tags · dd4f8963
  Rocky Duan committed Aug 13, 2012
  
  dd4f8963 Browse Files
- make following and recent tags display actual things · 62bc1aae
  Rocky Duan committed Aug 13, 2012
  
  62bc1aae Browse Files
- removed edit button in the bottom bar · 2dde3b00
  Rocky Duan committed Aug 13, 2012
  
  2dde3b00 Browse Files
- update discussion.md · ce9b5b07
  Rocky Duan committed Aug 13, 2012
  
  ce9b5b07 Browse Files
- instructions for setting up the environment · 7142b692
  Rocky Duan committed Aug 13, 2012
  
  7142b692 Browse Files
- added configuration parameter to turn on / off discussion service · 17427752
  Rocky Duan committed Aug 13, 2012
  
  17427752 Browse Files
- replaced comment client sym link · d6f34929
  Rocky Duan committed Aug 12, 2012
  
  d6f34929 Browse Files
- added title & tag for new post & fixed error handling; reply button in generated… · 12897fff
```
added title & tag for new post & fixed error handling; reply button in generated thread doesn't work
```
  Rocky Duan committed Aug 12, 2012
  12897fff Browse Files
- fixed unicode bug · 7b7164a1
  Rocky Duan committed Aug 12, 2012
  
  7b7164a1 Browse Files
12 Aug, 2012 5 commits
- removed unnecessary template · 322828fb
  Rocky Duan committed Aug 12, 2012
  
  322828fb Browse Files
- refactored comment_client working · 44f7b37b
  Rocky Duan committed Aug 12, 2012
  
  44f7b37b Browse Files
- Merge branch 'mergedtom' into refactor · b7d33618
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
```
  Rocky Duan committed Aug 11, 2012
  b7d33618 Browse Files
- changed comment_client module to be imported as cc · de8c828f
  Rocky Duan committed Aug 11, 2012
  
  de8c828f Browse Files
- switched to refactored comment_client · 2848c1fe
  Rocky Duan committed Aug 11, 2012
  
  2848c1fe Browse Files
11 Aug, 2012 10 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
- uh · 86b53bb2
  Rocky Duan committed Aug 10, 2012
  
  86b53bb2 Browse Files
- merge tom's styles · f44358ab
  Brittany Cheng committed Aug 10, 2012
  
  f44358ab Browse Files
08 Aug, 2012 10 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