Commits · 513b0606f89b1fa30c685dc09ae684075f077d6b · edx / edx-platform · GitLab

04 Sep, 2012 31 commits
- fixed close threads · 513b0606
  Rocky Duan committed Sep 04, 2012
  
  513b0606 Browse Files
- oops fixed following · 2b734ebe
  Rocky Duan committed Sep 04, 2012
  
  2b734ebe Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · feba29f4
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 04, 2012
  feba29f4 Browse Files
- fixed endorse · e9bbe049
  Rocky Duan committed Sep 04, 2012
  
  e9bbe049 Browse Files
- tweaked dogear and discussion column styles · db2b67b5
  Tom Giannattasio committed Sep 04, 2012
  
  db2b67b5 Browse Files
- fixed merge conflict · c88efb1b
  Tom Giannattasio committed Sep 04, 2012
  
  c88efb1b Browse Files
- fixed drop filter · 1b2f8c3e
  Tom Giannattasio committed Sep 04, 2012
  
  1b2f8c3e Browse Files
- merge · dc3f06e5
  Arjun Singh committed Sep 04, 2012
  
  dc3f06e5 Browse Files
- fix search · 45a8fdda
  Arjun Singh committed Sep 04, 2012
  
  45a8fdda Browse Files
- Fix voting. · 8c7e56a3
  Matthew Mongeau committed Sep 04, 2012
  
  8c7e56a3 Browse Files
- new icons for new post; fixed icons on reply · 70eca949
  Tom Giannattasio committed Sep 04, 2012
  
  70eca949 Browse Files
- fixed long lines in the category drop · 07fee0a6
  Tom Giannattasio committed Sep 04, 2012
  
  07fee0a6 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · aaa54018
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Sep 04, 2012
  aaa54018 Browse Files
- fixed preview text overlapping content · d7b3ac54
  Tom Giannattasio committed Sep 04, 2012
  
  d7b3ac54 Browse Files
- Comment should pass endorsed to template. · 12b6feff
  Matthew Mongeau committed Sep 04, 2012
  
  12b6feff Browse Files
- improve date search, fix respnding, make sidebar expand when discussion column does · 3f8b533a
  Arjun Singh committed Sep 04, 2012
  
  3f8b533a Browse Files
- Somewhat compacted the embedded thread view, but it probably needs a more thorough redesign. · f1fbbbda
  Ibrahim Awwal committed Sep 04, 2012
  
  f1fbbbda Browse Files
- minor sidebar fix · 9874aebb
  Arjun Singh committed Sep 04, 2012
  
  9874aebb Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 146a8e1e
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 04, 2012
  146a8e1e Browse Files
- fix up sidebar jitter · dd8a687f
  Arjun Singh committed Sep 04, 2012
  
  dd8a687f Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 8276e299
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 04, 2012
  8276e299 Browse Files
- fit permission into new discussion view structure; admin actions not working yet · cafc45bf
  Rocky Duan committed Sep 04, 2012
  
  cafc45bf Browse Files
- Oops, this was needed for replies to be rendered in the main forum view. · 69f0b92f
  Ibrahim Awwal committed Sep 04, 2012
  
  69f0b92f Browse Files
- Embedded discussions displayed with the new style but without replying yet. · d78d5b2d
```
Needs different CSS to make it more appropriate in the embedded view.
```
  Ibrahim Awwal committed Sep 04, 2012
  d78d5b2d Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 335be2bb
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 03, 2012
  335be2bb Browse Files
- add all filter · fee8d05f
  Arjun Singh committed Sep 03, 2012
  
  fee8d05f Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · eabd6aec
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  eabd6aec Browse Files
- allowing for 0 top level topics · 7de28f38
  Arjun Singh committed Sep 03, 2012
  
  7de28f38 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · e53a5f73
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  e53a5f73 Browse Files
- Top level discussions · a5b03a12
  Arjun Singh committed Sep 03, 2012
  
  a5b03a12 Browse Files
- fixed wmd editor / tag for new post · a50a861e
  Rocky Duan committed Sep 03, 2012
  
  a50a861e Browse Files
03 Sep, 2012 1 commit
- Temporary fix for topictext issues. · a692c9a2
  Matthew Mongeau committed Sep 03, 2012
  
  a692c9a2 Browse Files
02 Sep, 2012 8 commits
- Pull out discussion-thread-list-template into its own file. · 32157371
  Ibrahim Awwal committed Sep 02, 2012
  
  32157371 Browse Files
- Fix discussions in xmodules · 1594c3e7
```
Conflicts:

	lms/static/coffee/src/discussion/main.coffee
```
  Arjun Singh committed Sep 02, 2012
  1594c3e7 Browse Files
- commented out unnecessary code · 3f04897d
  Rocky Duan committed Sep 02, 2012
  
  3f04897d Browse Files
- dropdown filter · 997c4c6c
  Rocky Duan committed Sep 02, 2012
  
  997c4c6c Browse Files
- make markdown & latex work for response / comments (not perfect) · a3fc550a
  Rocky Duan committed Sep 02, 2012
  
  a3fc550a Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · a8b20cca
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 02, 2012
  a8b20cca Browse Files
- escape html · 14ff18fe
  Rocky Duan committed Sep 02, 2012
  
  14ff18fe Browse Files
- Create a new template that inherits from course_navigation.html to avoid… · efa799f7
```
Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button.
```
  Ibrahim Awwal committed Sep 01, 2012
  efa799f7 Browse Files