Commits · a587cb5a3c9da99d2792cd9e1fef6b7076bb5e9f · edx / edx-platform · GitLab

03 Aug, 2012 19 commits
- Merge branch 'discussion2' of github.com:dementrock/mitx · a587cb5a
  Rocky Duan committed Aug 03, 2012
  
  a587cb5a Browse Files
- show discussion & reply fix · 7d1b577b
  Rocky Duan committed Aug 03, 2012
  
  7d1b577b Browse Files
- follow button style · 0a2aafab
  Brittany Cheng committed Aug 03, 2012
  
  0a2aafab Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 4ac3eebc
  Brittany Cheng committed Aug 03, 2012
  
  4ac3eebc Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · 2077729d
  Rocky Duan committed Aug 03, 2012
  
  2077729d Browse Files
- follow button · ec258a63
  Brittany Cheng committed Aug 03, 2012
  
  ec258a63 Browse Files
- fix reply & some random stuff · 9b2578c7
  Rocky Duan committed Aug 03, 2012
  
  9b2578c7 Browse Files
- follow button · b73e329d
  Brittany Cheng committed Aug 03, 2012
  
  b73e329d Browse Files
- slight changes · fd922cf7
  Rocky Duan committed Aug 03, 2012
  
  fd922cf7 Browse Files
- Merge branch 'discussion2' · 52248562
  Rocky Duan committed Aug 03, 2012
  
  52248562 Browse Files
- slight changes · 8297f7b5
  Rocky Duan committed Aug 03, 2012
  
  8297f7b5 Browse Files
- 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 21 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