Commits · 15fa639e8b417b9af6997d5add5fb7bef2a7ab22 · edx / edx-platform · GitLab

03 Aug, 2012 8 commits
- merge conflict · 15fa639e
  Brittany Cheng committed Aug 03, 2012
  
  15fa639e Browse Files
- move follow, remove hover · 69475c63
  Brittany Cheng committed Aug 03, 2012
  
  69475c63 Browse Files
- ajax submit new post · e59ea854
  Rocky Duan committed Aug 03, 2012
  
  e59ea854 Browse Files
- ajax reply & why am I on discussion2.. · 0b96d009
  Rocky Duan committed Aug 03, 2012
  
  0b96d009 Browse Files
- some archived stuff for later · 89c28115
  Rocky Duan committed Aug 03, 2012
  
  89c28115 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · f7e9746e
  Rocky Duan committed Aug 03, 2012
  
  f7e9746e Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 7ab13732
  Rocky Duan committed Aug 03, 2012
  
  7ab13732 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · dac28f80
  Brittany Cheng committed Aug 03, 2012
  
  dac28f80 Browse Files
02 Aug, 2012 32 commits
- Merge branch 'master' into discussion2 · 51961c1c
  Rocky Duan committed Aug 02, 2012
  
  51961c1c Browse Files
- some refactoring on error handling · cc477138
  Rocky Duan committed Aug 02, 2012
  
  cc477138 Browse Files
- refactored some code · 5ba879fc
  Rocky Duan committed Aug 02, 2012
  
  5ba879fc Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · 839463e9
  Brittany Cheng committed Aug 02, 2012
  
  839463e9 Browse Files
- sort styles · 2238137d
  Brittany Cheng committed Aug 02, 2012
  
  2238137d Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 3b312a2c
  Brittany Cheng committed Aug 02, 2012
  
  3b312a2c Browse Files
- add class for selected sort option · 833b8950
  Rocky Duan committed Aug 02, 2012
  
  833b8950 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · cf4ac2ef
  Brittany Cheng committed Aug 02, 2012
  
  cf4ac2ef Browse Files
- Merge branch 'master' into discussion2 · 4749f3a5
  Rocky Duan committed Aug 02, 2012
  
  4749f3a5 Browse Files
- should have done this long time ago · f579730f
  Rocky Duan committed Aug 02, 2012
  
  f579730f Browse Files
- Merge branch 'master' into discussion2 · d183e91f
  Rocky Duan committed Aug 02, 2012
  
  d183e91f Browse Files
- small fic · 6a23e910
  Rocky Duan committed Aug 02, 2012
  
  6a23e910 Browse Files
- rocky's coffee edits · f649084a
  Brittany Cheng committed Aug 02, 2012
  
  f649084a Browse Files
- refactored discussion.coffee into separate files · 88a98ef5
  Rocky Duan committed Aug 02, 2012
  
  88a98ef5 Browse Files
- Merge branch 'master' into discussion2 · bad84669
  Rocky Duan committed Aug 02, 2012
  
  bad84669 Browse Files
- i meant sort before...this time it's search ajax · 0375710d
  Rocky Duan committed Aug 02, 2012
  
  0375710d Browse Files
- reply styles · 55ce53f9
  Brittany Cheng committed Aug 02, 2012
  
  55ce53f9 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 4a605ab9
  Brittany Cheng committed Aug 02, 2012
  
  4a605ab9 Browse Files
- paginator styles · 7f0282a2
  Brittany Cheng committed Aug 02, 2012
  
  7f0282a2 Browse Files
- ajax search in inline view · 7b65663e
  Rocky Duan committed Aug 02, 2012
  
  7b65663e Browse Files
- styles · fffad764
  Brittany Cheng committed Aug 02, 2012
  
  fffad764 Browse Files
- oops · 1da86a78
  Rocky Duan committed Aug 02, 2012
  
  1da86a78 Browse Files
- hide the annoying staff info for now · 2811f504
  Rocky Duan committed Aug 02, 2012
  
  2811f504 Browse Files
- make cancel/submit work and hide watch discussion · 381fe951
  Rocky Duan committed Aug 02, 2012
  
  381fe951 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · 7b66cae3
  Rocky Duan committed Aug 02, 2012
  
  7b66cae3 Browse Files
- display show comments button · fd1e91ae
  Rocky Duan committed Aug 02, 2012
  
  fd1e91ae Browse Files
- reply styles · 10c13665
  Brittany Cheng committed Aug 02, 2012
  
  10c13665 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · 1e7e2f25
  Rocky Duan committed Aug 02, 2012
  
  1e7e2f25 Browse Files
- random fixes · 380c6f86
  Rocky Duan committed Aug 02, 2012
  
  380c6f86 Browse Files
- Fix github_sync tests · 3b6f33f5
```
* CMS no longer syncs, it just imports when it gets a commit note
  from github
```
  Victor Shnayder committed Aug 02, 2012
  3b6f33f5 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 7d414346
  Brittany Cheng committed Aug 02, 2012
  
  7d414346 Browse Files
- styles · b47edaa9
  Brittany Cheng committed Aug 02, 2012
  
  b47edaa9 Browse Files