Commits · f0b60fed10262b01b6a7a3aea4fed78dee7ba933 · edx / edx-platform · GitLab

23 Aug, 2012 40 commits
- adding maintenance static data · f0b60fed
  John Jarvis committed Aug 23, 2012
  
  f0b60fed Browse Files
- Merge pull request #525 from MITx/feature/arjun/comment_depth · d084506d
```
Limiting depth of comments
```
  David Ormsbee committed Aug 23, 2012
  d084506d Browse Files
- Merge pull request #526 from MITx/feature/forum_config · ec94d751
```
Feature/forum config
```
  arjun810 committed Aug 23, 2012
  ec94d751 Browse Files
- read the comment service shared key from django config · ec485880
  David Ormsbee committed Aug 23, 2012
  
  ec485880 Browse Files
- another unicode fix for forums · c52dd5fa
  David Ormsbee committed Aug 23, 2012
  
  c52dd5fa Browse Files
- Merge pull request #519 from MITx/feature/arjun/cs188_css · d8342255
```
cs188 styling
```
  Victor Shnayder committed Aug 23, 2012
  d8342255 Browse Files
- Merge pull request #518 from MITx/feature/arjun/fix_choicegroup · b0e418a3
```
Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. 
```
  kimth committed Aug 23, 2012
  b0e418a3 Browse Files
- Limiting depth of comments · d1a8cd3f
  Arjun Singh committed Aug 23, 2012
  
  d1a8cd3f Browse Files
- Merge pull request #524 from MITx/feature/forum_unicode · 27347fbc
```
Fix error when unicode string is in message viewed in single-thread
```
  David Ormsbee committed Aug 23, 2012
  27347fbc Browse Files
- Fix error when unicode string is in message viewed in single-thread template · a24fd328
  David Ormsbee committed Aug 23, 2012
  
  a24fd328 Browse Files
- Merge pull request #521 from MITx/feature/rocky/loading · dc13ff81
```
added a loading icon when retrieving ajax
```
  David Ormsbee committed Aug 23, 2012
  dc13ff81 Browse Files
- Merge pull request #520 from MITx/feature/rocky/discussion · 26536902
```
add user profile and fixed edit
```
  David Ormsbee committed Aug 23, 2012
  26536902 Browse Files
- Merge branch 'master' into feature/rocky/discussion · 6de05997
  David Ormsbee committed Aug 23, 2012
  
  6de05997 Browse Files
- Merge pull request #523 from MITx/feature/cale/aws-subdomain-branding · 22cbc1bd
```
Add subdomain_branding key to aws settings
```
  Calen Pennington committed Aug 23, 2012
  22cbc1bd Browse Files
- Add subdomain_branding key to aws settings · f4e75f5c
  Calen Pennington committed Aug 23, 2012
  
  f4e75f5c Browse Files
- fixed pluralize · e4890a8b
  Rocky Duan committed Aug 23, 2012
  
  e4890a8b Browse Files
- hide similar post wrapper when no results · f2507d7c
  Rocky Duan committed Aug 23, 2012
  
  f2507d7c Browse Files
- fixed file uploading · 5d903669
  Rocky Duan committed Aug 23, 2012
  
  5d903669 Browse Files
- make similar posts url working · 0b00e3b0
  Rocky Duan committed Aug 23, 2012
  
  0b00e3b0 Browse Files
- make similar posts go away when submitted post · 5fb2bbbd
  Rocky Duan committed Aug 23, 2012
  
  5fb2bbbd Browse Files
- fixed loading for discussion module · 2b6a0928
  Rocky Duan committed Aug 23, 2012
  
  2b6a0928 Browse Files
- Merge branch 'feature/rocky/discussion' into feature/rocky/loading · 16ca13f2
  Rocky Duan committed Aug 23, 2012
  
  16ca13f2 Browse Files
- include discussion js group in coursewar & removed unnecessary code · 233f817f
  Rocky Duan committed Aug 23, 2012
  
  233f817f Browse Files
- display loading status · abe12ddd
  Rocky Duan committed Aug 23, 2012
  
  abe12ddd Browse Files
- fixed discussion title and edit · 74bc2329
  Rocky Duan committed Aug 23, 2012
  
  74bc2329 Browse Files
- add user profile page back · 007de179
  Rocky Duan committed Aug 22, 2012
  
  007de179 Browse Files
- only execude code when backbone is defined · 4dae36cd
  Rocky Duan committed Aug 22, 2012
  
  4dae36cd Browse Files
- scroll to top after reloading threads · 45431ae7
  Rocky Duan committed Aug 22, 2012
  
  45431ae7 Browse Files
- Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. This… · 0757712e
```
Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. This should be done via CSS. This change only affects radiogroup and checkboxgroup as far as changing the behavior goes
```
  Arjun Singh committed Aug 22, 2012
  0757712e Browse Files
- cs188 styling · 1c9029c1
  Arjun Singh committed Aug 22, 2012
  
  1c9029c1 Browse Files
- Merge pull request #517 from MITx/feature/fix_discussions_with_dashes · e347c98e
```
change url regexp to handle discussions in coursenames with dashes
```
  David Ormsbee committed Aug 22, 2012
  e347c98e Browse Files
- change url regexp to handle discussions in coursenames with dashes · e3cdad0d
  David Ormsbee committed Aug 23, 2012
  
  e3cdad0d Browse Files
- fix (aka de-feature) the "see all children" link on the wiki · c0372c25
  Victor Shnayder committed Aug 23, 2012
  
  c0372c25 Browse Files
- Merge pull request #512 from MITx/feature/rocky/discussion · 79b0ff62
```
fixed recent threads & tags links
```
  David Ormsbee committed Aug 22, 2012
  79b0ff62 Browse Files
- Do JS fix for collectstatic that we had on main for discussion's index.html · 53c3d60e
  David Ormsbee committed Aug 23, 2012
  
  53c3d60e Browse Files
- Merge branch 'master' into feature/rocky/discussion · 2d67a4c0
  David Ormsbee committed Aug 23, 2012
  
  2d67a4c0 Browse Files
- Merge pull request #514 from MITx/feature/arjun/customize_info_sidebar · daf33dbc
```
adding the ability to override the sidebar name
```
  David Ormsbee committed Aug 22, 2012
  daf33dbc Browse Files
- Merge pull request #510 from MITx/kimth/blog-link-fix · 972837a9
```
Blog link fix
```
  David Ormsbee committed Aug 22, 2012
  972837a9 Browse Files
- Merge pull request #516 from MITx/feature/fix_backbone_js · 8e560688
```
Feature/fix backbone js
```
  David Ormsbee committed Aug 22, 2012
  8e560688 Browse Files
- Put dev.py's DEBUG back to True (cough) · 32403fb2
  David Ormsbee committed Aug 23, 2012
  
  32403fb2 Browse Files