Commits · c46b232e193725482a4f3eb4a36bb66197eead81 · edx / edx-platform · GitLab

31 Jul, 2012 26 commits
- oops missed a bracket · c46b232e
  Rocky Duan committed Jul 31, 2012
  
  c46b232e Browse Files
- bug fix search bar lol.. · 32c76d13
  Rocky Duan committed Jul 31, 2012
  
  32c76d13 Browse Files
- bug fix: resize input for defaulttext (tagsinput) · 20f958e6
  Rocky Duan committed Jul 31, 2012
  
  20f958e6 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 · c43d5d23
```
Conflicts:
	lms/static/coffee/src/discussion.coffee
```
  Rocky Duan committed Jul 31, 2012
  c43d5d23 Browse Files
- buttons · 83624270
  Brittany Cheng committed Jul 31, 2012
  
  83624270 Browse Files
- show new post form after clicking button · 401f57b8
  Rocky Duan committed Jul 31, 2012
  
  401f57b8 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · ddce6d8c
  Brittany Cheng committed Jul 31, 2012
  
  ddce6d8c Browse Files
- make search bar configurable · 799f66b7
  Rocky Duan committed Jul 31, 2012
  
  799f66b7 Browse Files
- search button style · 48674d6f
  Brittany Cheng committed Jul 31, 2012
  
  48674d6f Browse Files
- retrieve inline discussion by ajax · c39b2db6
  Rocky Duan committed Jul 31, 2012
  
  c39b2db6 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 607bc6b5
  Brittany Cheng committed Jul 31, 2012
  
  607bc6b5 Browse Files
- only show edit button when user can edit · 701f8716
  Rocky Duan committed Jul 31, 2012
  
  701f8716 Browse Files
- edit styles for tags, discussion votes, etc · cf92f356
  Brittany Cheng committed Jul 31, 2012
  
  cf92f356 Browse Files
- modify anonymity handling; display comments count · e301be4a
  Rocky Duan committed Jul 31, 2012
  
  e301be4a Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · 32cf7c6f
  Brittany Cheng committed Jul 31, 2012
  
  32cf7c6f Browse Files
- Merge pull request #321 from MITx/feature/kfiedler/courseware-style · 7bfd2173
```
Fixed jquery ui image problem and added a base style sheet for lms to ov...
```
  David Ormsbee committed Jul 31, 2012
  7bfd2173 Browse Files
- Fixed jquery ui image problem and added a base style sheet for lms to override fonts · 2bbb1979
  Kyle Fiedler committed Jul 31, 2012
  
  2bbb1979 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 9bd1aa94
  Brittany Cheng committed Jul 31, 2012
  
  9bd1aa94 Browse Files
- fix raw tag data bug · a08d4b80
  Rocky Duan committed Jul 31, 2012
  
  a08d4b80 Browse Files
- fix merge conflicts · 27848337
  Brittany Cheng committed Jul 31, 2012
  
  27848337 Browse Files
- discussion styles · 6285f2a2
  Brittany Cheng committed Jul 31, 2012
  
  6285f2a2 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · ada66adf
  Rocky Duan committed Jul 31, 2012
  
  ada66adf Browse Files
- basic editing functionality · 6f440018
  Rocky Duan committed Jul 31, 2012
  
  6f440018 Browse Files
- Re-add __init__.py for contentstore that was accidentally deleted in… · 2f95a8e1
```
Re-add __init__.py for contentstore that was accidentally deleted in 05add581
```
  Calen Pennington committed Jul 31, 2012
  2f95a8e1 Browse Files
- Merge pull request #319 from MITx/kimth/lms-coderesponse · 94e73936
```
Kimth/lms coderesponse
```
  ichuang committed Jul 30, 2012
  94e73936 Browse Files
- Read XML for queuename · b9e5e9f0
  kimth committed Jul 30, 2012
  
  b9e5e9f0 Browse Files
30 Jul, 2012 14 commits
- Simplify default linenumbers behavior · 6244412c
  kimth committed Jul 30, 2012
  
  6244412c Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 6da690f6
  Brittany Cheng committed Jul 30, 2012
  
  6da690f6 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · bba8e297
  Brittany Cheng committed Jul 30, 2012
  
  bba8e297 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · cc47de51
  Brittany Cheng committed Jul 30, 2012
  
  cc47de51 Browse Files
- fix merge conflicts · a98c505b
  Brittany Cheng committed Jul 30, 2012
  
  a98c505b Browse Files
- Merge branch 'master' of github.com:MITx/mitx · cef34722
  Rocky Duan committed Jul 30, 2012
  
  cef34722 Browse Files
- fix accordion · 24610899
  Rocky Duan committed Jul 30, 2012
  
  24610899 Browse Files
- added color to error msg and borders to threads · 92cfded5
  Brittany Cheng committed Jul 30, 2012
  
  92cfded5 Browse Files
- Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors · e5fd9263
```
Added styles for errors
```
  David Ormsbee committed Jul 30, 2012
  e5fd9263 Browse Files
- Merge pull request #320 from MITx/feature/kfiedler/courseware-style · 1baa306c
```
Start to whip out a bunch of the styles and get courseware working
```
  David Ormsbee committed Jul 30, 2012
  1baa306c Browse Files
- refactored reply rendering by using mustache · d6b77077
  Rocky Duan committed Jul 30, 2012
  
  d6b77077 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · e705bbb7
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
```
  Rocky Duan committed Jul 30, 2012
  e705bbb7 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · 8228bebc
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
```
  Rocky Duan committed Jul 30, 2012
  8228bebc Browse Files
- added treeview · c611bd92
  Kyle Fiedler committed Jul 30, 2012
  
  c611bd92 Browse Files