Commits · aaa54018bfd2d2de6c77e8c950801577562c4aec · edx / edx-platform · GitLab

04 Sep, 2012 18 commits
- 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
- 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
01 Sep, 2012 13 commits
- improving new post · 133e15a2
  Arjun Singh committed Sep 01, 2012
  
  133e15a2 Browse Files
- new post 'works' · 1b107fd4
  Arjun Singh committed Sep 01, 2012
  
  1b107fd4 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 17fc8a0f
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 01, 2012
  17fc8a0f Browse Files
- working on newpost · ef5aeb69
  Arjun Singh committed Sep 01, 2012
  
  ef5aeb69 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · bcb6a5a9
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 01, 2012
  bcb6a5a9 Browse Files
- clear comment input after submit & not submit empty comment · bfa463a0
  Rocky Duan committed Sep 01, 2012
  
  bfa463a0 Browse Files
- Make the index page not stupid, but not particularly useful either. · 3b7d8434
  Ibrahim Awwal committed Sep 01, 2012
  
  3b7d8434 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · ed8c2b4a
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Aug 31, 2012
  ed8c2b4a Browse Files
- fixed user link and back button · 7e9305fb
  Rocky Duan committed Aug 31, 2012
  
  7e9305fb Browse Files
- Remove empty script tag. · 011264fb
  Ibrahim Awwal committed Aug 31, 2012
  
  011264fb Browse Files
- Refactor some things more and make the forum index sort of work, although the… · 4081386f
```
Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane.
```
  Ibrahim Awwal committed Aug 31, 2012
  4081386f Browse Files
- fix new post dropdown · 2c86bd68
  Arjun Singh committed Aug 31, 2012
  
  2c86bd68 Browse Files
- Moved some templates into separate files. · 860ec2fb
  Ibrahim Awwal committed Aug 31, 2012
  
  860ec2fb Browse Files