Commits · ebae40a39246180e561b186fb5aed04005c3b8b6 · edx / edx-platform

04 Sep, 2012 16 commits
- fix search · ebae40a3
  Arjun Singh committed Sep 04, 2012
  
  ebae40a3 Browse Files
- improve date search, fix respnding, make sidebar expand when discussion column does · 91379aa9
  Arjun Singh committed Sep 04, 2012
  
  91379aa9 Browse Files
- minor sidebar fix · 9064f81b
  Arjun Singh committed Sep 04, 2012
  
  9064f81b Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 2ca51f06
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 04, 2012
  2ca51f06 Browse Files
- fix up sidebar jitter · 890c5e50
  Arjun Singh committed Sep 04, 2012
  
  890c5e50 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · b2821c53
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 04, 2012
  b2821c53 Browse Files
- fit permission into new discussion view structure; admin actions not working yet · d39e3de5
  Rocky Duan committed Sep 04, 2012
  
  d39e3de5 Browse Files
- Oops, this was needed for replies to be rendered in the main forum view. · e8ac5860
  Ibrahim Awwal committed Sep 04, 2012
  
  e8ac5860 Browse Files
- Embedded discussions displayed with the new style but without replying yet. · 32ccf51e
```
Needs different CSS to make it more appropriate in the embedded view.
```
  Ibrahim Awwal committed Sep 04, 2012
  32ccf51e Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · dbfe3b35
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Arjun Singh committed Sep 03, 2012
  dbfe3b35 Browse Files
- add all filter · 52e780e0
  Arjun Singh committed Sep 03, 2012
  
  52e780e0 Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 6bae1609
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  6bae1609 Browse Files
- allowing for 0 top level topics · 629a8e7e
  Arjun Singh committed Sep 03, 2012
  
  629a8e7e Browse Files
- Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into… · 9a7afb58
```
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
```
  Rocky Duan committed Sep 03, 2012
  9a7afb58 Browse Files
- Top level discussions · 098b90eb
  Arjun Singh committed Sep 03, 2012
  
  098b90eb Browse Files
- fixed wmd editor / tag for new post · d9e7c5d9
  Rocky Duan committed Sep 03, 2012
  
  d9e7c5d9 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 1 commit

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.

committed Aug 31, 2012

f6ee0827 Browse Files