Commits · 48770145ffe2e346f6eb53898451ac12e3c96641 · edx / edx-platform · GitLab

02 Aug, 2012 39 commits
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · 48770145
  Brittany Cheng committed Aug 02, 2012
  
  48770145 Browse Files
- sort styles · b77b3867
  Brittany Cheng committed Aug 02, 2012
  
  b77b3867 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 400258ed
  Brittany Cheng committed Aug 02, 2012
  
  400258ed Browse Files
- add class for selected sort option · 34ef0029
  Rocky Duan committed Aug 02, 2012
  
  34ef0029 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · acff782f
  Brittany Cheng committed Aug 02, 2012
  
  acff782f Browse Files
- Merge branch 'master' into discussion2 · 723b3e4a
  Rocky Duan committed Aug 02, 2012
  
  723b3e4a Browse Files
- should have done this long time ago · 23f06e7b
  Rocky Duan committed Aug 02, 2012
  
  23f06e7b Browse Files
- Merge branch 'master' into discussion2 · bf70a621
  Rocky Duan committed Aug 02, 2012
  
  bf70a621 Browse Files
- small fic · b7bcc9d0
  Rocky Duan committed Aug 02, 2012
  
  b7bcc9d0 Browse Files
- rocky's coffee edits · 5e44bcb2
  Brittany Cheng committed Aug 02, 2012
  
  5e44bcb2 Browse Files
- refactored discussion.coffee into separate files · b43c1112
  Rocky Duan committed Aug 02, 2012
  
  b43c1112 Browse Files
- Merge branch 'master' into discussion2 · 0eb18826
  Rocky Duan committed Aug 02, 2012
  
  0eb18826 Browse Files
- i meant sort before...this time it's search ajax · 7c104b3a
  Rocky Duan committed Aug 02, 2012
  
  7c104b3a Browse Files
- reply styles · 0a9d1d2d
  Brittany Cheng committed Aug 02, 2012
  
  0a9d1d2d Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 25caeae6
  Brittany Cheng committed Aug 02, 2012
  
  25caeae6 Browse Files
- paginator styles · ceb8d00f
  Brittany Cheng committed Aug 02, 2012
  
  ceb8d00f Browse Files
- ajax search in inline view · 4f0964f2
  Rocky Duan committed Aug 02, 2012
  
  4f0964f2 Browse Files
- styles · ea5436c9
  Brittany Cheng committed Aug 02, 2012
  
  ea5436c9 Browse Files
- oops · 628917c5
  Rocky Duan committed Aug 02, 2012
  
  628917c5 Browse Files
- hide the annoying staff info for now · 5d71e2b0
  Rocky Duan committed Aug 02, 2012
  
  5d71e2b0 Browse Files
- make cancel/submit work and hide watch discussion · 22444e3f
  Rocky Duan committed Aug 02, 2012
  
  22444e3f Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · ed346443
  Rocky Duan committed Aug 02, 2012
  
  ed346443 Browse Files
- display show comments button · 2e51c2e7
  Rocky Duan committed Aug 02, 2012
  
  2e51c2e7 Browse Files
- reply styles · 7000fc15
  Brittany Cheng committed Aug 02, 2012
  
  7000fc15 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · 41ef0d36
  Rocky Duan committed Aug 02, 2012
  
  41ef0d36 Browse Files
- random fixes · ab7c869b
  Rocky Duan committed Aug 02, 2012
  
  ab7c869b Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 0103138c
  Brittany Cheng committed Aug 02, 2012
  
  0103138c Browse Files
- styles · 8f0c8f74
  Brittany Cheng committed Aug 02, 2012
  
  8f0c8f74 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 45e9a3aa
  Rocky Duan committed Aug 02, 2012
  
  45e9a3aa Browse Files
- Merge branch 'master' into discussion2 · 4f87195c
  Rocky Duan committed Aug 02, 2012
  
  4f87195c Browse Files
- retrieve threads by ajax · d539e900
  Rocky Duan committed Aug 02, 2012
  
  d539e900 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 509347fb
  Brittany Cheng committed Aug 02, 2012
  
  509347fb Browse Files
- sort styles · d350f0ef
  Brittany Cheng committed Aug 02, 2012
  
  d350f0ef Browse Files
- Merge branch 'hotfix/1.0.3' · cb7993e5
```
Conflicts:
	lms/urls.py
```
  David Ormsbee committed Aug 02, 2012
  cb7993e5 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · fbfe0d02
  Rocky Duan committed Aug 02, 2012
  
  fbfe0d02 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 234f8b00
  Brittany Cheng committed Aug 02, 2012
  
  234f8b00 Browse Files
- Merge pull request #334 from MITx/feature/victor/metadata-inherit · 4e7f2ae3
```
Feature/victor/metadata inherit
```
  Calen Pennington committed Aug 02, 2012
  4e7f2ae3 Browse Files
- oops · 659c51c9
  Rocky Duan committed Aug 01, 2012
  
  659c51c9 Browse Files
- fixed tag url · 81fb51ff
  Rocky Duan committed Aug 01, 2012
  
  81fb51ff Browse Files
01 Aug, 2012 1 commit
- Merge branch 'master' into discussion2 · e36dcdc6
```
Conflicts:
	lms/templates/discussion/_forum.html
	lms/templates/discussion/_inline.html
```
  Rocky Duan committed Aug 01, 2012
  e36dcdc6 Browse Files