Commits · 2238137df894863c06bb2cab4c17e5077b419128 · edx / edx-platform · GitLab

02 Aug, 2012 36 commits
- 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
- should have done this long time ago · f579730f
  Rocky Duan committed Aug 02, 2012
  
  f579730f 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
- 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
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · de2f48b3
  Rocky Duan committed Aug 02, 2012
  
  de2f48b3 Browse Files
- Merge branch 'master' into discussion2 · 0f3f5de6
  Rocky Duan committed Aug 02, 2012
  
  0f3f5de6 Browse Files
- retrieve threads by ajax · f1b3f696
  Rocky Duan committed Aug 02, 2012
  
  f1b3f696 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 2d54aa07
  Brittany Cheng committed Aug 02, 2012
  
  2d54aa07 Browse Files
- sort styles · 907e7636
  Brittany Cheng committed Aug 02, 2012
  
  907e7636 Browse Files
- Merge branch 'hotfix/1.0.3' · 73fb8f54
```
Conflicts:
	lms/urls.py
```
  David Ormsbee committed Aug 02, 2012
  73fb8f54 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · aa29b777
  Rocky Duan committed Aug 02, 2012
  
  aa29b777 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 8febbf24
  Brittany Cheng committed Aug 02, 2012
  
  8febbf24 Browse Files
- Merge pull request #334 from MITx/feature/victor/metadata-inherit · a7ae7905
```
Feature/victor/metadata inherit
```
  Calen Pennington committed Aug 02, 2012
  a7ae7905 Browse Files
- oops · efc0cc7c
  Rocky Duan committed Aug 01, 2012
  
  efc0cc7c Browse Files
- fixed tag url · e05faef8
  Rocky Duan committed Aug 01, 2012
  
  e05faef8 Browse Files
01 Aug, 2012 4 commits
- Merge branch 'master' into discussion2 · a8e23dcc
```
Conflicts:
	lms/templates/discussion/_forum.html
	lms/templates/discussion/_inline.html
```
  Rocky Duan committed Aug 01, 2012
  a8e23dcc Browse Files
- basic sorting · 9a31d7a9
  Rocky Duan committed Aug 01, 2012
  
  9a31d7a9 Browse Files
- remove debugging assert from test · e2ce5461
  Victor Shnayder committed Aug 01, 2012
  
  e2ce5461 Browse Files
- fix for inheriting metadata bug · 652e2aa2
```
* problem was on import to json--got all the metadata,
  but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
```
  Victor Shnayder committed Aug 01, 2012
  652e2aa2 Browse Files