Commits · 098b90ebac8b984aaffc7a191bf57e127b3e24f5 · edx / edx-platform · GitLab

04 Sep, 2012 1 commit
- Top level discussions · 098b90eb
  Arjun Singh committed Sep 03, 2012
  
  098b90eb Browse Files
03 Sep, 2012 1 commit
- Temporary fix for topictext issues. · 99ad4c0b
  Matthew Mongeau committed Sep 03, 2012
  
  99ad4c0b Browse Files
02 Sep, 2012 8 commits
- Pull out discussion-thread-list-template into its own file. · 722ce53e
  Ibrahim Awwal committed Sep 02, 2012
  
  722ce53e Browse Files
- Fix discussions in xmodules · 81bfdddc
```
Conflicts:

	lms/static/coffee/src/discussion/main.coffee
```
  Arjun Singh committed Sep 02, 2012
  81bfdddc Browse Files
- commented out unnecessary code · 644fb9c1
  Rocky Duan committed Sep 02, 2012
  
  644fb9c1 Browse Files
- dropdown filter · cae338a4
  Rocky Duan committed Sep 02, 2012
  
  cae338a4 Browse Files
- make markdown & latex work for response / comments (not perfect) · fd31ab30
  Rocky Duan committed Sep 02, 2012
  
  fd31ab30 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 77e0ef3f
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 02, 2012
  77e0ef3f Browse Files
- escape html · d22feb1b
  Rocky Duan committed Sep 02, 2012
  
  d22feb1b Browse Files
- Create a new template that inherits from course_navigation.html to avoid… · 1405cf97
```
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
  1405cf97 Browse Files
01 Sep, 2012 14 commits
- improving new post · d82534bc
  Arjun Singh committed Sep 01, 2012
  
  d82534bc Browse Files
- new post 'works' · 95cfbcc8
  Arjun Singh committed Sep 01, 2012
  
  95cfbcc8 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · b913c93f
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 01, 2012
  b913c93f Browse Files
- working on newpost · f6ee6f2a
  Arjun Singh committed Sep 01, 2012
  
  f6ee6f2a Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 70078146
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 01, 2012
  70078146 Browse Files
- clear comment input after submit & not submit empty comment · 09dade08
  Rocky Duan committed Sep 01, 2012
  
  09dade08 Browse Files
- Make the index page not stupid, but not particularly useful either. · 49f0dbd9
  Ibrahim Awwal committed Sep 01, 2012
  
  49f0dbd9 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · a67b76ae
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Aug 31, 2012
  a67b76ae Browse Files
- fixed user link and back button · fde77b7a
  Rocky Duan committed Aug 31, 2012
  
  fde77b7a Browse Files
- Remove empty script tag. · 8d3a70df
  Ibrahim Awwal committed Aug 31, 2012
  
  8d3a70df Browse Files
- Refactor some things more and make the forum index sort of work, although the… · f6ca91a5
```
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
  f6ca91a5 Browse Files
- fix new post dropdown · e3728f68
  Arjun Singh committed Aug 31, 2012
  
  e3728f68 Browse Files
- Moved some templates into separate files. · ecc65d6e
  Ibrahim Awwal committed Aug 31, 2012
  
  ecc65d6e Browse Files
- Fix the dropdown filtering so it actually ignores the unread messages count. · 4ce4c0c4
  Ibrahim Awwal committed Aug 31, 2012
  
  4ce4c0c4 Browse Files
31 Aug, 2012 8 commits
- Ensure that js files are returned in alphabetical order by django-pipeline. · f6ee0827
```
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
```
  Ibrahim Awwal committed Aug 31, 2012
  f6ee0827 Browse Files
- tweaked sidebar bugs · d1238a27
  Tom Giannattasio committed Aug 31, 2012
  
  d1238a27 Browse Files
- basic discussion profile styles · d8591c28
  Tom Giannattasio committed Aug 31, 2012
  
  d8591c28 Browse Files
- added filter drop; tweaked sidebar coordinate settings to accommodate new post · b167e0f7
  Tom Giannattasio committed Aug 31, 2012
  
  b167e0f7 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · faabb01d
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 31, 2012
  faabb01d Browse Files
- fixed posted details margin bug · 1515919f
  Tom Giannattasio committed Aug 31, 2012
  
  1515919f Browse Files
- populate dropdown · 795c1163
  Arjun Singh committed Aug 31, 2012
  
  795c1163 Browse Files
- Display current topic and adjust font size. · 5bfb5168
  Matthew Mongeau committed Aug 30, 2012
  
  5bfb5168 Browse Files
30 Aug, 2012 8 commits
- Hide menu when clicking body. · 28343b3a
  Matthew Mongeau committed Aug 30, 2012
  
  28343b3a Browse Files
- Show dropdown on click. · dc9f49b6
  Matthew Mongeau committed Aug 30, 2012
  
  dc9f49b6 Browse Files
- Add highlighting back in · 3521d421
  Matthew Mongeau committed Aug 30, 2012
  
  3521d421 Browse Files
- Remove loading icon. · 88100bf7
  Matthew Mongeau committed Aug 30, 2012
  
  88100bf7 Browse Files
- Track comment · 6a27f6dd
  Matthew Mongeau committed Aug 30, 2012
  
  6a27f6dd Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 000a745c
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Tom Giannattasio committed Aug 30, 2012
  000a745c Browse Files
- merge conflict fixes · a7281341
  Tom Giannattasio committed Aug 30, 2012
  
  a7281341 Browse Files
- Keep active thread active · 31f7d6f4
  Matthew Mongeau committed Aug 30, 2012
  
  31f7d6f4 Browse Files