Commits · 71df263ff920b07ac713305cf2c915548c5e28fe · edx / edx-platform · GitLab

20 Aug, 2012 6 commits
- disable all course db related signals · 71df263f
  Rocky Duan committed Aug 20, 2012
  
  71df263f Browse Files
- fixed discussion permission test · 1f50da88
  Rocky Duan committed Aug 20, 2012
  
  1f50da88 Browse Files
- Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int · b4039fe8
```
Conflicts:
	requirements.txt
```
  Rocky Duan committed Aug 20, 2012
  b4039fe8 Browse Files
- modified mustache template working · d5c2b04c
  Rocky Duan committed Aug 19, 2012
  
  d5c2b04c Browse Files
- Fix errors that were preventing collectstatic from running · c7d2e252
  David Ormsbee committed Aug 19, 2012
  
  c7d2e252 Browse Files
- Merge branch 'master' into feature/bk_forum_int · 9fceae7a
  David Ormsbee committed Aug 19, 2012
  
  9fceae7a Browse Files
19 Aug, 2012 26 commits
- work around compatibility issue · 96b9a370
  Rocky Duan committed Aug 19, 2012
  
  96b9a370 Browse Files
- mustache template · 12d51334
  Rocky Duan committed Aug 19, 2012
  
  12d51334 Browse Files
- Merge pull request #459 from MITx/feature/bridger/new_wiki · a729e16e
```
Fix broken dependency updates for wiki
```
  David Ormsbee committed Aug 19, 2012
  a729e16e Browse Files
- Use -e in django-wiki requirement · e79d5637
  David Ormsbee committed Aug 19, 2012
  
  e79d5637 Browse Files
- Updated django-wiki and plugin imports. · 24c0b514
  Bridger Maxwell committed Aug 19, 2012
  
  24c0b514 Browse Files
- slight behavior change · 64e61605
  Rocky Duan committed Aug 19, 2012
  
  64e61605 Browse Files
- shouldn't commit env config · d17981a9
  Rocky Duan committed Aug 19, 2012
  
  d17981a9 Browse Files
- shouldn't commit env config · 991bb01a
  Rocky Duan committed Aug 19, 2012
  
  991bb01a Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 6164c870
  Rocky Duan committed Aug 19, 2012
  
  6164c870 Browse Files
- fixed comment retrieval · 80ab2d27
  Rocky Duan committed Aug 19, 2012
  
  80ab2d27 Browse Files
- Merge pull request #452 from MITx/feature/bridger/new_wiki · 6c3b28b5
```
Feature/bridger/new wiki
```
  David Ormsbee committed Aug 19, 2012
  6c3b28b5 Browse Files
- Merge pull request #456 from MITx/kimth/multiple-fileupload · 9c4b1d70
```
Kimth/multiple fileupload
```
  David Ormsbee committed Aug 19, 2012
  9c4b1d70 Browse Files
- Use list comprehension · 20adaa81
  kimth committed Aug 19, 2012
  
  20adaa81 Browse Files
- Default param is None rather than [] · 9b94bb17
  kimth committed Aug 19, 2012
  
  9b94bb17 Browse Files
- Simplify is_list_of_files · e2bca44c
  kimth committed Aug 19, 2012
  
  e2bca44c Browse Files
- Adjust tests to reflect list of file objects, not just file · 52d24320
  kimth committed Aug 19, 2012
  
  52d24320 Browse Files
- Send multiple files to xqueue · f5e60412
  kimth committed Aug 19, 2012
  
  f5e60412 Browse Files
- Send multiple files to xqueue · b2599f07
  kimth committed Aug 19, 2012
  
  b2599f07 Browse Files
- Multiple file submissions · d2cb6458
  kimth committed Aug 19, 2012
  
  d2cb6458 Browse Files
- AJAX permits multiple file upload · d920e718
  kimth committed Aug 19, 2012
  
  d920e718 Browse Files
- Filesubmission template allows multiple file selection · 588444c4
  kimth committed Aug 19, 2012
  
  588444c4 Browse Files
- major refactor of templates · b4ec109d
  Rocky Duan committed Aug 19, 2012
  
  b4ec109d Browse Files
- some refactor · e49226e9
  Rocky Duan committed Aug 19, 2012
  
  e49226e9 Browse Files
- minor refactoring · 1c1d449a
  Rocky Duan committed Aug 18, 2012
  
  1c1d449a Browse Files
- refactored code to render ajax content · 0dd5428e
  Rocky Duan committed Aug 18, 2012
  
  0dd5428e Browse Files
- Merge branch 'master' into profile · 238adb1a
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  238adb1a Browse Files
18 Aug, 2012 8 commits
- Merge branch 'master' of github.com:MITx/mitx into profile · 028bd23c
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  028bd23c Browse Files
- cache setting · 0d2f787c
  Rocky Duan committed Aug 18, 2012
  
  0d2f787c Browse Files
- Merge pull request #455 from MITx/kimth/circuitsim-link-fix · 9aeec690
```
Remove outdated hardcoded url from circuit simulator
```
  ichuang committed Aug 18, 2012
  9aeec690 Browse Files
- Added MathJax to wiki pages. · 1e08164d
  Bridger Maxwell committed Aug 18, 2012
  
  1e08164d Browse Files
- Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. · 0598a471
  Bridger Maxwell committed Aug 18, 2012
  
  0598a471 Browse Files
- More info in comment · 78b3ca05
  kimth committed Aug 18, 2012
  
  78b3ca05 Browse Files
- Remove outdated hardcoded url from circuit simulator · 25d38905
  kimth committed Aug 18, 2012
  
  25d38905 Browse Files
- Added javascript groups to wiki preview modal so circuits show up. · 3fc59b3d
  Bridger Maxwell committed Aug 18, 2012
  
  3fc59b3d Browse Files